Merge branch 'issue/12' into 'master'

Issue #12: Fix workspace reading

See merge request !14
2 jobs for master in 1 minute and 9 seconds (queued for 1 second)