Modified podspec
Merge branch 'master' into develop