Merge branch 'develop' fix #33 fix #38, merge #40
Update podspec
Merge branch 'master' into develop