Release v0.1.24
Release v0.1.25
Merge branch 'develop'