Bug fixes
Merge pull request #15 from Lukenickerson/master

Bug fixes