Merge branch 'release/2.0.0' into develop
Enforce NSArray
Bump 2.1.0
Merge branch 'release/2.1.0'