Merge branch 'develop'
updated podspec
Merge branch 'master' into develop