Fix sample generator
Merge pull request #27 from mbilbille/master

Fix sample generator