Implemented support for maps

Title says it all. I am using this branch for a couple of days now, works on my machine (troll)