Fix issue #197
Merge pull request #204 from Prillan/js-fixes

Improve Cakefile
Merge pull request #205 from Prillan/issue197

Fix issue #197
Refactoring of javascript started