Wiki updates, relates to issue #25.