Fix
Merge pull request #22 from illyaine/master

..