New Feature for v2.0

v2.0
Merge remote-tracking branch 'origin/r_feature1'