0.0.4 bug fixing