Add latest comments
Merge branch 'release/v0.2.5' into develop