Some additional updates
Merge pull request #7 from jknewson/master

Some additional updates