new branch dev_1.1
dev_1.1: updates