Merge pull request #9 from himedlooff/master

Fixes #5.
fixed #10
Removes unused function.