Merge pull request #4 from codywd/develop

Bring master up to develop