CoffeeScript 1.7 compatibility, fixes #2