Fixed issue #268
Recompiled JS
Fixed second part of issue #268
Merge remote-tracking branch 'remotes/catodique/master'