Merge branch 'dev' into 'master'

Dev

Closes #14, #16, and #13

See merge request !8
1 job for master in 4 minutes and 56 seconds (queued for 1 second)
Status Job ID Name Coverage
  Build
passed #27095
build

00:04:56