0.40.20 OS X layout
Merge pull request #227 from lethosor/0.40.20-osx-layout

0.40.20 OS X layout