fix some bugs
fix some bugs
Merge branch 'paomian' into development