Merge branch 'quick_fix_to_models' into 'master'

Fixes #60 Fixes #61

Closes #60 and #61

See merge request !64
9 jobs for master in 5 minutes and 5 seconds (queued for 2 seconds)