Sync selection and map better, fourth commit ;)
Merge pull request #1 from gelicia/master

Sync selection and map better, fourth commit ;)