Bug fix and bump version to 0.0.4