Merge pull request #1881 from jbeda/release-0.4

Release 0.4.1