diff --git a/build/odata.d.ts b/build/odata.d.ts
index 8094a80..06e5f0d 100644
--- a/build/odata.d.ts
+++ b/build/odata.d.ts
@@ -1,5 +1,5 @@
 import { Http, Response } from '@angular/http';
-import { Observable } from 'rxjs/rx';
+import { Observable } from 'rxjs/Rx';
 import { ODataConfiguration } from './config';
 import { ODataQuery } from './query';
 import { GetOperation } from './operation';
diff --git a/build/odata.js b/build/odata.js
index 5c8a549..1ba7c21 100644
--- a/build/odata.js
+++ b/build/odata.js
@@ -1,5 +1,5 @@
 "use strict";
-const rx_1 = require('rxjs/rx');
+const Rx_1 = require('rxjs/Rx');
 const query_1 = require('./query');
 const operation_1 = require('./operation');
 class ODataService {
@@ -47,7 +47,7 @@ class ODataService {
             .catch((err, caught) => {
             if (this.config.handleError)
                 this.config.handleError(err, caught);
-            return rx_1.Observable.throw(err);
+            return Rx_1.Observable.throw(err);
         });
     }
     extractData(res) {
diff --git a/build/operation.d.ts b/build/operation.d.ts
index c315a07..ae6db4a 100644
--- a/build/operation.d.ts
+++ b/build/operation.d.ts
@@ -1,5 +1,5 @@
 import { URLSearchParams, Http, Response, RequestOptions } from '@angular/http';
-import { Observable } from 'rxjs/rx';
+import { Observable } from 'rxjs/Rx';
 import { ODataConfiguration } from './config';
 export declare abstract class ODataOperation<T> {
     protected _typeName: string;
diff --git a/build/operation.js b/build/operation.js
index b669ec0..f51bc54 100644
--- a/build/operation.js
+++ b/build/operation.js
@@ -1,6 +1,6 @@
 "use strict";
 const http_1 = require('@angular/http');
-const rx_1 = require('rxjs/rx');
+const Rx_1 = require('rxjs/Rx');
 class ODataOperation {
     constructor(_typeName, config, http) {
         this._typeName = _typeName;
@@ -28,7 +28,7 @@ class ODataOperation {
             .catch((err, caught) => {
             if (this.config.handleError)
                 this.config.handleError(err, caught);
-            return rx_1.Observable.throw(err);
+            return Rx_1.Observable.throw(err);
         });
     }
     getEntityUri(entityKey) {
diff --git a/build/query.d.ts b/build/query.d.ts
index 3e599c3..4152bfe 100644
--- a/build/query.d.ts
+++ b/build/query.d.ts
@@ -1,5 +1,5 @@
 import { Http } from '@angular/http';
-import { Observable } from 'rxjs/rx';
+import { Observable } from 'rxjs/Rx';
 import { ODataConfiguration } from './config';
 import { ODataOperation } from './operation';
 export declare class PagedResult<T> {
diff --git a/build/query.js b/build/query.js
index b7e50e3..18d43c3 100644
--- a/build/query.js
+++ b/build/query.js
@@ -1,5 +1,5 @@
 "use strict";
-const rx_1 = require('rxjs/rx');
+const Rx_1 = require('rxjs/Rx');
 const operation_1 = require('./operation');
 class PagedResult {
 }
@@ -29,24 +29,24 @@ class ODataQuery extends operation_1.ODataOperation {
     Exec() {
         let params = this.getQueryParams();
         let config = this.config;
-        return this.http.get(this.buildResourceURL(), { search: params })
+        return this.http.get(this.buildResourceURL(), { search: params, headers: this.config.requestOptions.headers })
             .map(res => this.extractArrayData(res, config))
             .catch((err, caught) => {
             if (this.config.handleError)
                 this.config.handleError(err, caught);
-            return rx_1.Observable.throw(err);
+            return Rx_1.Observable.throw(err);
         });
     }
     ExecWithCount() {
         let params = this.getQueryParams();
         params.set('$count', 'true'); // OData v4 only
         let config = this.config;
-        return this.http.get(this.buildResourceURL(), { search: params })
+        return this.http.get(this.buildResourceURL(), { search: params, headers: this.config.requestOptions.headers })
             .map(res => this.extractArrayDataWithCount(res, config))
             .catch((err, caught) => {
             if (this.config.handleError)
                 this.config.handleError(err, caught);
-            return rx_1.Observable.throw(err);
+            return Rx_1.Observable.throw(err);
         });
     }
     buildResourceURL() {
diff --git a/build/query.js.map b/build/query.js.map
index 42eb420..628db7d 100644
--- a/build/query.js.map
+++ b/build/query.js.map
@@ -1 +1 @@
-{"version":3,"file":"query.js","sourceRoot":"","sources":["../src/query.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"query.js","sourceRoot":"","sources":["../src/query.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
diff --git a/src/odata.ts b/src/odata.ts
index 08693b3..b444536 100644
--- a/src/odata.ts
+++ b/src/odata.ts
@@ -1,5 +1,5 @@
 import { URLSearchParams, Http, Response, Headers, RequestOptions } from '@angular/http';
-import { Observable, Operator } from 'rxjs/rx';
+import { Observable, Operator } from 'rxjs/Rx';
 import { ODataConfiguration } from './config';
 import { ODataQuery } from './query';
 import { GetOperation } from './operation';
diff --git a/src/operation.ts b/src/operation.ts
index 04e4aa3..cf31c4a 100644
--- a/src/operation.ts
+++ b/src/operation.ts
@@ -1,5 +1,5 @@
 import { URLSearchParams, Http, Response, RequestOptions } from '@angular/http';
-import { Observable, Operator } from 'rxjs/rx';
+import { Observable, Operator } from 'rxjs/Rx';
 import { ODataConfiguration } from './config';
 
 export abstract class ODataOperation<T> {
diff --git a/src/query.ts b/src/query.ts
index 2959203..01a27f9 100644
--- a/src/query.ts
+++ b/src/query.ts
@@ -1,5 +1,5 @@
 import { URLSearchParams, Http, Response } from '@angular/http';
-import { Observable, Operator, Subject } from 'rxjs/rx';
+import { Observable, Operator, Subject } from 'rxjs/Rx';
 import { ODataConfiguration } from './config';
 import { ODataOperation } from './operation';
 
@@ -41,7 +41,7 @@ export class ODataQuery<T> extends ODataOperation<T> {
     public Exec(): Observable<Array<T>> {
         let params = this.getQueryParams();
         let config = this.config;
-        return this.http.get(this.buildResourceURL(), { search: params })
+        return this.http.get(this.buildResourceURL(), { search: params, headers: this.config.requestOptions.headers })
             .map(res => this.extractArrayData(res, config))
             .catch((err: any, caught: Observable<Array<T>>) => {
                 if (this.config.handleError) this.config.handleError(err, caught);
@@ -54,7 +54,7 @@ export class ODataQuery<T> extends ODataOperation<T> {
         params.set('$count', 'true'); // OData v4 only
         let config = this.config;
 
-        return this.http.get(this.buildResourceURL(), { search: params })
+        return this.http.get(this.buildResourceURL(), { search: params, headers: this.config.requestOptions.headers })
             .map(res => this.extractArrayDataWithCount(res, config))
             .catch((err: any, caught: Observable<PagedResult<T>>) => {
                 if (this.config.handleError) this.config.handleError(err, caught);