Updated with convenience methods and some output generation.
The latter will be removed in the future.
Authored by: keess 2008-11-20
Parent: [r2153]
Child: [r2155]