fixed cyclic namespace dependency caused by defining generic and function for PedClass
merged changes in namespace from local branch
comment generic for PedClass
Merged branch

removed conflict in DESCRIPTION