#495 documentation