Andiry Merge pull request #101 from pleiadesian/fix-map-sync