Merge pull request #63 from Postmedia/tojs

more doc changes
updated error handling
Merge branch 'master' into tojs