Updating fork

updating fork with latest changes