added the OSX/iOS schemes
Merge commit 'aad3bc0'