Merging release 0.4