updates
Merge remote-tracking branch 'origin/master' into develop
Merge pull request #18 from jmmaloney4/develop

Develop