Merge develop into master in preparation of v0.5.0 release