updated OS X app with Jonathans PC code