x86 config
Merge pull request #1 from JeanBaptisteArnaud/x86

x86 config