Merge pull request #34 from seeafish/master

Merged #34