added changes from damoTestBranch
modifiction from master branch
merged