Merge pull request #1 from DMats/master

Adding Roadrunner to cache branch as well.
Merge pull request #2 from DMats/cache

Merge pull request #1 from DMats/master