Merge branch 'master' into develop
Typo
Update coffee-script's lexer
Add tests