[Helper] Refactor according to google-map lib
Merge pull request #64 from egeloen/f-container

[Helper] Refactor according to google-map lib