Merge branch 'master' of https://github.com/mercooreal/Earthquake