Remove comments
Update to coffee version
Merge branch 'coffee'