fixed merge issues
Merge pull request #11 from jknewson/master

fixed merge issues