Updating my fork with latest changes from