Create an iOS and OS X target
Merge branch 'ios'