bug fix for v0.41
Merge branch 'master' of https://github.com/VictorChenLi/BatonPublic.git
Bug fix for v0.41