Added support to OS X 10.7 and iOS 10.5