Merge pull request #64 from fengjingchao/dev

refactor enter preparing
fix travis: glog