updated
Merge branch 'release/v0.2.4' into develop