Merge pull request #38 from niravpatel2008/mitesh

Mitesh
Js change
Merge pull request #39 from niravpatel2008/nirav

Js change
solve some fixes :mitesh
mitesh changes