fix #31 & #41 , add tc and update docs