Merge pull request #1 from brucecoddington/feature/updates

updates
Merge pull request #4 from brucecoddington/develop

Develop