Re #429. Imported map code from earlier svn branch.
Merge pull request #16 from Pilus/429-Maps

Re #429. Imported map code from earlier svn branch.