Merge pull request #9 from Mendroyxx/master

Pulling the master branch to the geolocalisation branch