Merge pull request #525 from Maaack/update-docs