bruce/twfy — pull request #2 by bruce (2013-11-13 00:24:49+00:00)
Title: Modernization

Changes from @tomhipkin and other modernizations