Ready for next release: version 2.1