my first commit from dev3
Merge branch 'mydev3'
merge dev3 into master