Merge branch 'Jack' into 'master'

Merge in Jack's changes

Closes #45 and #43

See merge request !23
4 jobs for master in 43 seconds (queued for 1 second)