Bugfix
Merge pull request #88 from zoic21/master

Bugfix