v0.9dev bugfixes
Merge branch 'dev' of https://github.com/niklasramo/popo into dev