Sync with develop branch for bug fix #108

Closed cenlinhe closed 10 months ago