First draft of release-0.4.1