BUG: quick (and wrong) fix to generate_data argument
Merge branch 'develop'