Fix
Merge pull request #17 from Xephi/master

Fix