fixed some shortcoming in 0.1.0