Update and fixes changes from utensils
Merge pull request #1 from modeset/utensils_upgrade

Update and fixes changes from utensils