Modified for iPhone 5
Resolved merge conflict