Merging updated files to master