Fix bugs
Release 0.0.4