Upgraded for TypeScript 0.9.1.1