Localization of fluids and buckets

:P
Oh..
Merge pull request #16 from Mrkwtkr/patch-1

Localization of fluids and buckets