Improved docs. See GH-15