steve changed some stuff
Merge branch 'master' into tandybranch