refs #28, changes indicated by Ulrik