Merge pull request #39 from david-on-github/develop

sync
Merge pull request #40 from david-on-github/David-Dev

Merge pull request #39 from david-on-github/develop