Add default, improve sampling
Minor fix for default parameters
Merge pull request #4 from mfeurer/master

Changes