Merge branch 'master' into skywinder-master
update podspec after merge