merging the latest from butchersboy repo