Dwayne iOS 8

This is the apple iOS 8 code fixing work