Issue #2. Added more TypeScript.