Fixing errors
Merge remote-tracking branch 'george/master'