converted the coffeescript to javascript
Merge remote-tracking branch 'upstream/master'

ohruwefjks