Merge pull request #1 from davharris/master

add data-generating parameters