Update client.js
Merge pull request #97 from YOURsammich/master

MAJOR CHANGES