Merge pull request #1 from zdebol1/dev1

fork commit_1
fork commit2