fix #54 + tests
fix
clean
Merge pull request #74 from alexshadow007/master

Closes #54