Merge branch 'dev' of https://github.com/gecko655/earthquake into dev