Merging up-to-date my branch to master