Don't wait until data is loaded to get the map setup
Merge pull request #2 from klusark/stuff

Don't wait until data is loaded to get the map setup