Merge pull request #5 from mtrberzi/master

Accept non-URL arguments to engine