Fixes in JavaScript Library
Merge pull request #2556 from vlakoff/develop-4

Fixes in JavaScript Library