OSX support and new example layout