Merge branch 'master' into 'master'

Merge for version 1.1.7 - pre FSL Course

Closes #6, #7, #11, #13, and #15

See merge request !25
3 jobs for 1.1.7 in 4 minutes and 13 seconds (queued for 5 seconds)
latest