Matthew Walker - 2003-07-01

unified diff with fixes and tests