Updated to version 4
Merge branch 'branch1'