added txt on doc file
merge master to this branch