fixes #87, also fixes errors in the coffeescript syntax and formatting
Merge branch 'master' of https://github.com/YaleSTC/doris