Added the new logic.
Merge branch 'master' of github.com:geftimov/LocationHelper