Merge pull request #359 from parrt/master

mv to runtime. was ref'ing v3 not v4 Token.
Merge branch 'master' into tree-patterns