iOS 6 Support + Rebase some fork changes