issue #17: fix crash on iOS 7
Merge branch 'issue_17'