merged js-changes into coffeescript