js changes
Merge pull request #87 from raviosc/developer104

js changes