Merge branch 'google-earth'
Merge branch 'master' of https://github.com/ina111/MatRockSim