Fixed #8
Fixed #9
update to v0.2.1