Improved map plotting
Merge branch 'master' of github.com:blogsh/SOCS