stil bugfixing
v0.2