Fairness applied
Merge pull request #287 from conorfennell/master

Fairness applied