Client and Server prototype merged to master branch