Pullrequest for Commit 	df410b8

Fixes in some maps!