Fixes #44

This should do the trick ;) if you need some other features, please let
me know