First commit
Merge pull request #1 from dugjason/develop

First commit