Additional client edits
Merge pull request #7 from agrant12/add-client-edits

Additional client edits