3rd commit

iOS 7 compatible here