Switch to kayahr's typescript branch