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

David dev
Testing commit
Made comment in Client.java
Merge pull request #53 from david-on-github/Mark-Dev

Mark dev