Developer-207 For Fix Issues related to Js
Merge pull request #92 from raviosc/developer207

Developer-207 For Fix Issues related to Js