Merge pull request #72 from dorkster/feature/engine_0.19

Feature/engine 0.19