Made negotiateContent an option and default on
Merge branch 'master' of github.com:hhariri/wasabi