Merge pull request #513 from Maaack/update-docs