Further corrections to the program. Almost working as intended
Authored by: arjenmarkus 2008-09-30
Parent: [r227]
Child: [r229]
