diff --git a/Makefile b/Makefile
index 60d3725..a369cb9 100644
--- a/Makefile
+++ b/Makefile
@@ -15,6 +15,7 @@ compile:
 
 # Compile tests
 compile-tests: compile
+	rm -rf ./test-compiled
 	@$(COFFEE) --output ./test-compiled --no-header --compile -b ./test
 
 # Run lint for coffeescript
diff --git a/lib/filesystem-google-storage.js b/lib/filesystem-google-storage.js
index 288646f..8140a24 100644
--- a/lib/filesystem-google-storage.js
+++ b/lib/filesystem-google-storage.js
@@ -96,7 +96,11 @@ GoogleStorageClient = (function() {
    */
 
   GoogleStorageClient.prototype.readFile = function(path) {
-    return this.file(path).createReadStream();
+    return new Promise((function(_this) {
+      return function(res) {
+        return res(_this.file(path).createReadStream());
+      };
+    })(this));
   };
 
 
diff --git a/lib/index.js b/lib/index.js
index d19e0cc..4cbadd7 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1,17 +1 @@
-var FsClient, GoogleStorageClient, Manager, ReadResult, S3Bucket, ref;
-
-ref = require('./filesystem-manager'), Manager = ref.Manager, ReadResult = ref.ReadResult;
-
-FsClient = require('./filesystem-fs').FsClient;
-
-S3Bucket = require('./filesystem-s3').S3Bucket;
-
-GoogleStorageClient = require('./filesystem-google-storage').GoogleStorageClient;
-
-module.exports = {
-  Manager: Manager,
-  ReadResult: ReadResult,
-  FsClient: FsClient,
-  S3Bucket: S3Bucket,
-  GoogleStorageClient: GoogleStorageClient
-};
+module.exports = Object.assign({}, require('./filesystem-manager'), require('./filesystem-fs'), require('./filesystem-s3'), require('./filesystem-google-storage'));
diff --git a/package.json b/package.json
index d46396e..ec6e5fa 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jaune-fs",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "description": "file system for jaune framework",
   "main": "index.js",
   "scripts": {
diff --git a/src/filesystem-google-storage.coffee b/src/filesystem-google-storage.coffee
index 9d7316a..ee5a2ea 100644
--- a/src/filesystem-google-storage.coffee
+++ b/src/filesystem-google-storage.coffee
@@ -72,7 +72,9 @@ class GoogleStorageClient
    * @param    {String} path The key of the object
    * @returns  {Stream}
   ###
-  readFile : (path) -> @file(path).createReadStream()
+  readFile : (path) ->
+    new Promise (res) =>
+      res @file(path).createReadStream()
 
   ###*
    * @function Checks if file exists.
diff --git a/test/filesystem-google-storage/readFile.coffee b/test/filesystem-google-storage/readFile.coffee
index 88d0a65..1ca0028 100644
--- a/test/filesystem-google-storage/readFile.coffee
+++ b/test/filesystem-google-storage/readFile.coffee
@@ -61,10 +61,12 @@ describe 'filesystem-google-storage-fs', ->
 
         @fs
           .readFile FileNameOrigin
-          .on 'data', (data) ->
-            equal data.toString('utf-8'), FileData
-          .on 'end', cb
-          .on 'error', (err) -> cb equal null, err
+          .then (stream) ->
+            stream
+              .on 'data', (data) ->
+                equal data.toString('utf-8'), FileData
+              .on 'end', cb
+              .on 'error', (err) -> cb equal null, err
 
     describe 'failing', ->
 
@@ -93,6 +95,8 @@ describe 'filesystem-google-storage-fs', ->
 
       it 'should fail to read non existing file', (cb) ->
 
-        new PassThrough().pipe(@fs
-            .readFile FileNameOriginNonExisting
-            .on 'error', ({code}) -> cb equal code, 500)
+        @fs
+          .readFile FileNameOriginNonExisting
+          .then (stream) ->
+            new PassThrough().pipe(
+              stream.on 'error', ({code}) -> cb equal code, 500)