merged with cody
fixed check fainted
Merge remote-tracking branch 'Joey/master'