bug fixes
Merge pull request #14 from ryanstorberg/master

bug fixes