Fix #20, #17, retire $class
Bump up version to 2.3.0
Merge branch 'v2.3.0'
Merge branch 'master' into v2.3.0
Merge branch 'v2.3.0'