Changed annotation adding behavior & increased iOS 7 support