code cleanup, fix a small bug
0.2.0