changes from code-review.
Merge branch 'natan-notes' of https://github.com/yuval-netanel/inapp-ios into natan-notes