Adding my changes before I almost lose them again.
Merge branch 'master' of blag:notepost