bug fix of master. now v1.1

v1.1
merged of v1.1 bugfix

merge of v1.1 bugfix