Merge pull request #587 from LopezChris/master

Important documentation update