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

Merge pull request #18 from david-on-github/develop
Merge pull request #20 from david-on-github/develop

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