Merge pull request #2 from rpspringuel/master

Modifications to engines.