iOS6 support

As promised.