v2.0

See CHANGES.md for details