Helma's changes

See issue #65 for listing.
Merge pull request #71 from helmadik/hdik_herodotus

Helma's changes