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

 	PedMap, major refactorings
Fixed bug what is snp
Merge pull request #8 from erwinwinder/master

 	Fixed bug what is snp
resolve conflict