fix bug
Merge branch '0.5'