Merge pull request #11 from jfthomps/develop

I accidentally pushed changes to my personal clone of the repo instead of directly to the project repo.