Stop the JS dying
Merge branch 'master' of github.com:dandart/projectchaplin