udpated to v0.2