PedMap, major refactorings
Merge pull request #7 from erwinwinder/master

 	PedMap, major refactorings