Version 2.1.1

Minor changes