merge with map
Merge branch 'master' of https://github.com/radzio-k/hackathon2014