Merge pull request #3 from meetmagdalene/master

updating master
Merge pull request #4 from meetmagdalene/google-location-plugin

Merge pull request #3 from meetmagdalene/master