Merge branch 'master' into 'production'

version 1.0.0

See merge request !21
3 jobs for production
in 0 seconds, using 0 compute credits, and was queued for 0 seconds