jslint, doc, refactored
Merge remote-tracking branch 'origin/master'