Some fixes
Merge pull request #9 from khendricks/master

Some fixes