Code refactoring
More map fixes...
Merge pull request #80 from mshamash/master

Migration to google maps