working version on 0.9.4, using .js instead of .coffee
Merge remote-tracking branch 'origin/master' into latest