Engine rewrite
added where
fixed typo
Merge pull request #2 from raymondidema/development

Development