Corrected types pointed out by David
Merge remote-tracking branch 'origin'