Merge pull request #7 from labyrwa/master

Merge with master