Merge branch 'issue/91' into 'develop'

Issue #91: Refactor engine

See merge request !79
4 jobs for develop in 1 minute and 7 seconds (queued for 2 seconds)