fixes #832 - adds parameterized class support
Credits:This patch is based on the original work of Olivier Favre<olivier@yakaz.com> many many thanks!