Map changes
Merge branch 'master' of github.com:whoshuu/chimerider