Merge develop into master v0.3.1