first changes applied
bugs fixed
Merge pull request #5 from alaurenty/fixing-js-bugs-after-merge

Fixing js bugs after merge