Latest changes for release 0.4