Adds iOS6.1 suport
Merge branch 'ios6'