Fix some sins
Merge branch 'release/0.2.5'
Merge tag '0.2.5' into develop

Release 0.2.5

Because 0.2.4 was horked