Merge pull request #3 from jpizarrom/feature-ga

Feature ga
fix map