2 Upgrade to 2.0 from 1.8

by DariRose