Updated client, afte NPM packaging
Merge server