object syntax error fix for js compiler
Merge branch 'devel' into gh-pages
merged code from devel