version update
merge branch 'release/v0.2.3' into develop