Merge pull request #1 from watzenare/develop

Client developed
Merge pull request #2 from watzenare/develop

Tests developed
- Updated documentation
- Deprecated unused values
- Added new test case
- Corrected bug found with the new test