Citrus beta - @louiskearns;@melari

please test and let us know results - @louiskearns, @melari