Merge pull request #7 from futhr/master

Minor engine fixes.