Develop

Merging javascript bugfix