Merge pull request #68 from mnfienen/classy

Classy
Merge pull request #69 from mnfienen/classy

Classy
Merge remote-tracking branch 'upstream/classy' into classy