Release 2.1
Minor changes