Merge pull request #2 from jconkin/develop

Develop
Merge pull request #3 from jconkin/master

Trying to make master current with develop