Merge pull request #78 from arik-so/typescript_fixes