Merge pull request #4 from codywd/develop

Bring master up to develop
Merge pull request #5 from codywd/master

Merge pull request #4 from codywd/develop