Merge branch 'develop'
Update podspec
Change author and social media url
Fix podspec
Merge branch 'master' into develop