more error displaying
Merge remote-tracking branch 'origin/master'
Almost ready