Small style fix
Merge branch 'master' into with_podspec