bugfix
Merge pull request #18 from ticmy/master

bugfix