Merge pull request #1 from dsjohnson/develop

Develop
Merge pull request #3 from jmlondon/develop

Merge pull request #1 from dsjohnson/develop