Refactoring; iOS 5 compatibility; Readme