rm make_data
Merge branch 'alpha0.3'