Dev

This pull will update the master branch with the new arrangement where the javascript code is contained in a separate file.