Update to version 2.1.1 (merge of previous + 2.1)