Added more error correction.
Merge remote-tracking branch 'origin/master'