Fixed some bugs
0.2.2