Merge branch 'release/0.2.5'
Merge tag '0.2.5' into develop

0.2.5