Ensure model images are immutable before use (Fixes #46)
Merge branch 'develop' into feature/add-hints