Updated to dual target, OSX and iOS