One more change from unstable20
Merge pull request #62 from wmathurin/unstable20_iOS

One more change from unstable20