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

David dev
Testing commit
Merge pull request #47 from david-on-github/Mark-Dev

Mark dev