1.2! full iOS 7.1.x support, minor refactoring