Merge branch 'baltino'
Minimap improvments