Fix draw maps
Add history
Merge remote-tracking branch 'origin/master'