Bug fixes for ATC on map...
Merge pull request #29 from mshamash/master

Bug fixes for ATC on map...