ios 6
Merge pull request #32 from Cmjack/ios6

ios 6