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

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