Merge pull request #2 from shrimpza/develop

Develop
Merge pull request #3 from shrimpza/develop

Client application management