Merge pull request #12 from danShumway/develop Develop
Merge pull request #11 from danShumway/develop Research