fix bug
[sync] 0.2.5
GO FOR v0.2.6
Merge remote-tracking branch 'upstream/develop' into develop