0.40.16 OS X layout
Merge pull request #217 from lethosor/0.40.16-osx-layout

0.40.16 OS X layout