Improve guides: issue #217