Updating with latest changes from original repo