Changed to fix current location bug
Merge pull request #12 from usik/master

Changed to fix current location bug