Merge pull request #485 from Maaack/updates-documentation