Fixes
Merge pull request #1 from Irvyne/master

Fixes