Additional code and JS cleanup
Merge pull request #15 from cthielen/master

Additional code and JS cleanup