Improve js -> xml conversion
Merge branch 'master' of github.com:enoyhs/cps-nodejs-api