Merge branch 'sjs/add-node-export'
Merge branch 'sjs/fix-compile-warnings'