Fixes #11 and #12
Merge pull request #13 from ninjahopparn/master

Fixes #11 and #12