Fix #16
Merge pull request #17 from SonicWizard/master

Fix #16