Fixed #146
Merge pull request #156 from firethanatos/master

Fixed #146