Updated for XCode 6.2 beta 3 and iOS 8.2 beta

1) Code refactored.
2) Remove previous annotation code added.