Merging updates to my fork