Fixing some usage bugs
Merge pull request #101 from ramielrowe/master

Fixing some usage bugs