Merge Richard's release stuff