Fixing stupid bug
Finish 0.1.1