Merge pull request #839 from GDmac/develop

No need for eval to extend a class