extended map and definition factory so that only G4 namespace is used
Merge branch 'release/0.1.1'