First merge master and branch

changes in branch and master