Working on the js nightmare
Merge pull request #2 from TIY-Q2-FEE-CHS/master

working on the js
Merge pull request #6 from rphitt1/master

working on the js