Updated project to work with iOS8