0.0.6: bugs fixed