Revert to supporting positional arguments for csv file
Merge branch 'master' into release