Merge branch 'develop' into 'master'

v0.3.2

See merge request !21
2 jobs for master in 1 minute and 51 seconds (queued for 1 second)