This commit fixes #65
(Update the document as well)