Bugfixing. Ready for v0.20