Merge pull request #18 from himedlooff/dev

Fixes #1