buckket Merge pull request #138 from mdosch/patch-1 …