Prepare for v2.0 tag
Prepare for v3.0 development