Merge pull request #36 from starschema/engine-refactor

Engine refactor
update submodule ref