add mbp settings
Merge branch 'mbp'