Bug fixes
Release v0.0.4