Merging branch code in master