commit from branch 1

commit from branch 1
Merge pull request #1 from icdeccc/branch-1

commit from branch 1