Merge pull request #1 from danherd/master

Merge changes into master
Merge pull request #2 from danherd/develop

Merge pull request #1 from danherd/master