Merge branch 'hotfix' of https://github.com/comiscienceknight/MetroExplorer into hotfix
Merge branch 'master' into hotfix
little modify