Map working
Merge branch 'master' of https://github.com/elib/GGJ2013.git