initial commit: first test on the server side, proof of concept code on the client
Merge from github