Small sample fixes for #8
Merge pull request #10 from qrilka/issue-8-sample-fix

Small sample fixes for #8