modify to use coffeescript inheritance
Merge branch 'work'