Bug fix and document
Document