Make more error resistent
Merge remote-tracking branch 'origin/master'