Bugfix
Merge pull request #38 from ChiSamurai/master

Bugfix