merge from src
merge from src
JSHint
Merge pull request #10 from awwa/jshint

Jshint