Updating my fork to match master branch