Update to client project
Merge pull request #8 from Afr0/master

Hotfix 12212014