Bugfix sample branch
Merge pull request #1 from toddhiestand/bugfix_sample

Bugfix sample branch