Version 2.0

See README.md