Merging changes from forked repo