Merge pull request #5 from tehfreak/dev

v0.1.5, fixed #3