zerebubuth Merge pull request #4 from naoliv/patch-2