Merge branch 'master' into develop
Bump podspec version to 0.2.1
Merge branch 'release/0.2.1'