Update doc, can handle file not found exception
merge dev