Combined Andy and my changes

Github decided to die suddenly