Updated build files to latest. Repackaged as v2.0.7