Merge branch 'frm_tomwer_to_tomoscan2' into 'master'

Frm tomwer to tomoscan2

Closes #3

See merge request !22
7 jobs for master in 4 minutes and 29 seconds (queued for 1 second)