Merge pull request #212 from randy-waterhouse/master

User-samples updated.
Fixed for RH-derivative no-mixed make rules.
Merge pull request #3 from randy-waterhouse/master

Small make fix.