Bugfix
Merge pull request #47 from ly29/master

Bugfix