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

David dev