Merge pull request #212 from randy-waterhouse/master

User-samples updated.