minor bug fixes
Merge pull request #16 from jknewson/master

minor bug fixes