Merge branch 'release/0.2.4' into develop
fix
update
Merge branch 'release/0.2.6'