fix bug
Merge remote-tracking branch 'origin/dev-version0.5'