fixes #24
Merge pull request #27 from yyolk/master

fixes #24