Complete working version
Merge branch 'master' of https://github.com/sadupa/social-map