Merge pull request #8 from etishor/master

Merge server & client remote branches and fix conflicts