Merge from uncle cheese:master

get up to date