Merge pull request #8 from google/master

Fix old style classes
Merge branch 'master' into remove_showsource