Errors fixed

Errors fixed
Fixed errors
Fixed it
Unfixed

Unfixed
Fixed errors
Merge remote-tracking branch 'james/master'
Merge remote-tracking branch 'george/master'