Making the demo app work better on iOS 5.1
Merge pull request #77 from christophercotton/ios5changes

Making the demo app work better on iOS 5.1 for issue #64