Included pull request #5 in coffeescript, and added test for