Commit in the develop branch
Merge branches 'develop' and 'master'