Updated to v2.0

See changelog for details.