Updating my fork with all the changes that have been made.