Map working againg
Merge branch 'master' of github.com:GeekNightsCUU/ChART