#72: Merging the work on the wiki.