Fixes #9
Merge pull request #10 from SoCloz/fixes_9

Fixes #9