Fix for iOS6
Fix memory leak
Remove unused macro
turned to  ARC