Change Structure

Added iOS 7 support
Fixed issues with arc support