Merging updates master project