Manual merge of pull request #1. Added js linting.