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

David dev