Merging my branch to Master