Forget to def the short hand for use_mpi
Refactor codes
Fix a bug
Merge branch 'develop'