Support Ruby and CoffeeScript
Merge changes