Merge changes for release 0.4.2