Merge branch 'hotfix/2.0.1' into develop
add class method swizzling
Merge branch 'release/2.1.0'