Helma's changes

See issue #65 for listing.