Merge pull request #516 from Maaack/reorganize-and-edit-documentation