Fixed some bugs

Ready to release v0.2 ?