Merge pull request #22 from davghouse/develop

Develop
Merge pull request #23 from davghouse/develop

Develop
Merge pull request #24 from davghouse/master

Develop