merging typescript branch

merging typescript branch