Better handle configuration file using a config.json file.
Properly cache markers, to not abuse the server.
Merge branch 'master' into 31