v0.2.5.2

Various bugfixes thanks to Stuu