Fixed #21
Merge branch 'feature/4-gms-location'

Fixes my genius fuckup. Dunno why I was working on #4...