Try to have a better initial Configuration
Merge remote-tracking branch 'origin/master'