Basic fixes
Merge pull request #9 from Lukenickerson/master

Basic fixes