Fraction option done, (almost) ready to merge and close branch
Merge branch 'fraction-opt'