Merge pull request #20 from wherobots/use-new-runtime-ids

Merge pull request #20 from wherobots/use-new-runtime-ids #12