Changes for version 2.1.1