Code

added patch suggested by Lars Johannesen