Fixed bugs in 0.1.10