Code

ChangeLog: Add thanks to Peter Green.