Merge pull request #29 from stepio/master

iOS7 additional validations + code cleanup + minor enhancements
Thanks to stepio