Deriver demo fix.
Merge pull request #8 from EricWittmann/sramp-refactor-2

Deriver demo fix.