diff --git a/source/bin/framework.d.ts b/source/bin/framework.d.ts
index d34149b9..e1cadaa6 100644
--- a/source/bin/framework.d.ts
+++ b/source/bin/framework.d.ts
@@ -206,7 +206,7 @@ declare module es {
         setEnabled(isEnabled: boolean): this;
         setUpdateOrder(updateOrder: number): this;
         addComponent<T extends Component>(component: T): T;
-        getComponent(type: new (...args: any[]) => Component): Component;
+        getComponent<T extends Component>(type: new (...args: any[]) => T): T;
         getComponents(typeName: any, componentList?: any[]): any[];
         hasComponent(type: new (...args: any[]) => Component): boolean;
         removeComponent(component?: Component): void;
diff --git a/source/src/ECS/Component.ts b/source/src/ECS/Component.ts
index 97408c38..c63e78b1 100644
--- a/source/src/ECS/Component.ts
+++ b/source/src/ECS/Component.ts
@@ -119,12 +119,12 @@ module es {
             return this;
         }
 
-        public addComponent<T extends Component>(component: T) {
-            return this.entity.addComponent(component);
+        public addComponent<T extends Component>(component: T): T {
+            return this.entity.addComponent<T>(component);
         }
 
-        public getComponent(type: new (...args: any[])=>Component) {
-            return this.entity.getComponent(type);
+        public getComponent<T extends Component>(type: new (...args: any[])=>T): T {
+            return this.entity.getComponent<T>(type);
         }
 
         public getComponents(typeName: any, componentList?: any[]) {