Upgraded to 2.0.0, added lib to clean target