Mrtyler noooo they be stealin my bucket

Fixes issue #206.

This is on top of pull request #208 because I thought github was going to show the diff right but now it looks like it won't and I'm too lazy to fix it and all this stuff is getting merged and packaged one way or another, damn it. Anyway it's just the last two commits.