new final version - r2.0, correct csv output, and new (tested too) choice operations