Commit of code for release 0.0.4 (see CHANGELOG.md)