Merge branch 'master' of https://github.com/gecko655/earthquake.git