v0.2.5
Merge branch 'dev'