client link
Merge pull request #20 from korczis/master

Merge Master to Stable