Added polymorphic comment definition, closes #41