Updating the docs - #560 #561