Increased the text layer margin to compensate for an iOS 7 size calculation issue. Fixed issue #57.
Merge branch 'master' into release-2.0