Merge pull request #361 from JanEggers/JsBinding_WIP

merged master into Js binding wip
Merge remote-tracking branch 'upstream/JsBinding_WIP' into JsBinding_WIP