Added TypeScript fixes
essage=modified build to be ECMAScript3 compat
Added merged file