Merging v0.4 from develop branch