GitHub class names changed.
Merge pull request #36 from stefano-pogliani/master

GitHub class names changed.