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

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