Merge pull request #653 from afischerdev/engine-mode

Merge pull request #653 from afischerdev/engine-mode #485