diff --git a/.versions b/.versions
index 793149a8..65a73183 100644
--- a/.versions
+++ b/.versions
@@ -38,7 +38,7 @@ npm-mongo@1.5.45
 observe-sequence@1.0.12
 ordered-dict@1.0.8
 ostrio:cookies@2.0.5
-ostrio:files@1.7.2
+ostrio:files@1.7.3
 promise@0.8.3
 random@1.0.10
 reactive-var@1.0.10
diff --git a/demo-simplest-download-button/.meteor/.finished-upgraders b/demo-simplest-download-button/.meteor/.finished-upgraders
index dacc2c0d..aa607041 100644
--- a/demo-simplest-download-button/.meteor/.finished-upgraders
+++ b/demo-simplest-download-button/.meteor/.finished-upgraders
@@ -11,3 +11,5 @@ notices-for-facebook-graph-api-2
 1.2.0-cordova-changes
 1.2.0-breaking-changes
 1.3.0-split-minifiers-package
+1.4.0-remove-old-dev-bundle-link
+1.4.1-add-shell-server-package
diff --git a/demo-simplest-download-button/.meteor/packages b/demo-simplest-download-button/.meteor/packages
index a7a20ee5..417f175c 100644
--- a/demo-simplest-download-button/.meteor/packages
+++ b/demo-simplest-download-button/.meteor/packages
@@ -4,19 +4,20 @@
 # 'meteor add' and 'meteor remove' will edit this file for you,
 # but you can also edit it by hand.
 
-meteor-base             # Packages every Meteor app needs to have
-mobile-experience       # Packages for a great mobile UX
-mongo                   # The database Meteor supports right now
-blaze-html-templates    # Compile .html files into Meteor Blaze views
-reactive-var            # Reactive variable for tracker
-jquery                  # Helpful client-side library
-tracker                 # Meteor's client-side reactive programming library
+meteor-base@1.0.4             # Packages every Meteor app needs to have
+mobile-experience@1.0.4       # Packages for a great mobile UX
+mongo@1.1.12                   # The database Meteor supports right now
+blaze-html-templates@1.0.4    # Compile .html files into Meteor Blaze views
+reactive-var@1.0.10            # Reactive variable for tracker
+jquery@1.11.9                  # Helpful client-side library
+tracker@1.1.0                 # Meteor's client-side reactive programming library
 
-standard-minifier-css   # CSS minifier run for production mode
-standard-minifier-js    # JS minifier run for production mode
-es5-shim                # ECMAScript 5 compatibility for older browsers.
-ecmascript              # Enable ECMAScript2015+ syntax in app code
+standard-minifier-css@1.2.0   # CSS minifier run for production mode
+standard-minifier-js@1.2.0    # JS minifier run for production mode
+es5-shim@4.6.14                # ECMAScript 5 compatibility for older browsers.
+ecmascript@0.5.8              # Enable ECMAScript2015+ syntax in app code
 
 ostrio:files
 aldeed:simple-schema
 aldeed:collection2
+shell-server
diff --git a/demo-simplest-download-button/.meteor/release b/demo-simplest-download-button/.meteor/release
index f80cc1ce..72980bc2 100644
--- a/demo-simplest-download-button/.meteor/release
+++ b/demo-simplest-download-button/.meteor/release
@@ -1 +1 @@
-METEOR@1.3.4.1
+METEOR@1.4.1.1
diff --git a/demo-simplest-download-button/.meteor/versions b/demo-simplest-download-button/.meteor/versions
index 8504e775..24a94859 100644
--- a/demo-simplest-download-button/.meteor/versions
+++ b/demo-simplest-download-button/.meteor/versions
@@ -1,77 +1,78 @@
-aldeed:collection2@2.9.1
-aldeed:collection2-core@1.1.1
-aldeed:schema-deny@1.0.1
-aldeed:schema-index@1.0.1
+aldeed:collection2@2.10.0
+aldeed:collection2-core@1.2.0
+aldeed:schema-deny@1.1.0
+aldeed:schema-index@1.1.0
 aldeed:simple-schema@1.5.3
 allow-deny@1.0.5
-autoupdate@1.2.10
-babel-compiler@6.8.3
-babel-runtime@0.1.9_1
+autoupdate@1.2.11
+babel-compiler@6.9.1
+babel-runtime@0.1.11
 base64@1.0.9
 binary-heap@1.0.9
 blaze@2.1.8
 blaze-html-templates@1.0.4
 blaze-tools@1.0.9
 boilerplate-generator@1.0.9
-caching-compiler@1.0.5_1
+caching-compiler@1.1.7
 caching-html-compiler@1.0.6
 callback-hook@1.0.9
 check@1.2.3
-coffeescript@1.1.2_1
+coffeescript@1.2.4_1
 ddp@1.2.5
-ddp-client@1.2.8_1
+ddp-client@1.2.9
 ddp-common@1.2.6
-ddp-server@1.2.8_1
+ddp-server@1.2.10
 deps@1.0.12
 diff-sequence@1.0.6
-ecmascript@0.4.6_1
-ecmascript-runtime@0.2.11_1
+ecmascript@0.5.8
+ecmascript-runtime@0.3.14
 ejson@1.0.12
-es5-shim@4.5.12_1
+es5-shim@4.6.14
 fastclick@1.0.12
 geojson-utils@1.0.9
 hot-code-push@1.0.4
 html-tools@1.0.10
 htmljs@1.0.10
-http@1.1.7
+http@1.2.9
 id-map@1.0.8
 jquery@1.11.9
 launch-screen@1.0.12
 livedata@1.0.18
-logging@1.0.13_1
+logging@1.1.15
 mdg:validation-error@0.2.0
-meteor@1.1.15_1
+meteor@1.2.17
 meteor-base@1.0.4
-minifier-css@1.1.12_1
-minifier-js@1.1.12_1
+minifier-css@1.2.14
+minifier-js@1.2.14
 minimongo@1.0.17
 mobile-experience@1.0.4
 mobile-status-bar@1.0.12
-modules@0.6.4
-modules-runtime@0.6.4_1
-mongo@1.1.9_1
+modules@0.7.6
+modules-runtime@0.7.6
+mongo@1.1.12
 mongo-id@1.0.5
-npm-mongo@1.4.44_1
+npm-mongo@1.5.48
 observe-sequence@1.0.12
 ordered-dict@1.0.8
-ostrio:cookies@2.0.4
-ostrio:files@1.6.2
-promise@0.7.2_1
+ostrio:cookies@2.0.5
+ostrio:files@1.7.2
+promise@0.8.4
 raix:eventemitter@0.1.3
 random@1.0.10
 reactive-var@1.0.10
 reload@1.1.10
 retry@1.0.8
 routepolicy@1.0.11
+shell-server@0.2.1
 spacebars@1.0.12
 spacebars-compiler@1.0.12
-standard-minifier-css@1.0.7_1
-standard-minifier-js@1.0.7_1
-templating@1.1.12_1
+standard-minifier-css@1.2.0
+standard-minifier-js@1.2.0
+templating@1.2.14
 templating-tools@1.0.4
-tracker@1.0.14
+tracker@1.1.0
 ui@1.0.11
 underscore@1.0.9
 url@1.0.10
-webapp@1.2.9_1
+webapp@1.3.11
 webapp-hashing@1.0.9
diff --git a/demo-simplest-streaming/.meteor/.finished-upgraders b/demo-simplest-streaming/.meteor/.finished-upgraders
index dacc2c0d..aa607041 100644
--- a/demo-simplest-streaming/.meteor/.finished-upgraders
+++ b/demo-simplest-streaming/.meteor/.finished-upgraders
@@ -11,3 +11,5 @@ notices-for-facebook-graph-api-2
 1.2.0-cordova-changes
 1.2.0-breaking-changes
 1.3.0-split-minifiers-package
+1.4.0-remove-old-dev-bundle-link
+1.4.1-add-shell-server-package
diff --git a/demo-simplest-streaming/.meteor/packages b/demo-simplest-streaming/.meteor/packages
index 650ce389..360aafd9 100644
--- a/demo-simplest-streaming/.meteor/packages
+++ b/demo-simplest-streaming/.meteor/packages
@@ -4,17 +4,18 @@
 # 'meteor add' and 'meteor remove' will edit this file for you,
 # but you can also edit it by hand.
 
-meteor-base             # Packages every Meteor app needs to have
-mobile-experience       # Packages for a great mobile UX
-mongo                   # The database Meteor supports right now
-blaze-html-templates    # Compile .html files into Meteor Blaze views
-reactive-var            # Reactive variable for tracker
-jquery                  # Helpful client-side library
-tracker                 # Meteor's client-side reactive programming library
+meteor-base@1.0.4             # Packages every Meteor app needs to have
+mobile-experience@1.0.4       # Packages for a great mobile UX
+mongo@1.1.12                   # The database Meteor supports right now
+blaze-html-templates@1.0.4    # Compile .html files into Meteor Blaze views
+reactive-var@1.0.10            # Reactive variable for tracker
+jquery@1.11.9                  # Helpful client-side library
+tracker@1.1.0                 # Meteor's client-side reactive programming library
 
-standard-minifier-css   # CSS minifier run for production mode
-standard-minifier-js    # JS minifier run for production mode
-es5-shim                # ECMAScript 5 compatibility for older browsers.
-ecmascript              # Enable ECMAScript2015+ syntax in app code
+standard-minifier-css@1.2.0   # CSS minifier run for production mode
+standard-minifier-js@1.2.0    # JS minifier run for production mode
+es5-shim@4.6.14                # ECMAScript 5 compatibility for older browsers.
+ecmascript@0.5.8              # Enable ECMAScript2015+ syntax in app code
 
 ostrio:files
+shell-server
diff --git a/demo-simplest-streaming/.meteor/release b/demo-simplest-streaming/.meteor/release
index e5b4dc18..72980bc2 100644
--- a/demo-simplest-streaming/.meteor/release
+++ b/demo-simplest-streaming/.meteor/release
@@ -1 +1 @@
-METEOR@1.3.4.4
+METEOR@1.4.1.1
diff --git a/demo-simplest-streaming/.meteor/versions b/demo-simplest-streaming/.meteor/versions
index 485e609d..84e90ec2 100644
--- a/demo-simplest-streaming/.meteor/versions
+++ b/demo-simplest-streaming/.meteor/versions
@@ -1,70 +1,71 @@
 allow-deny@1.0.5
 autoupdate@1.2.11
-babel-compiler@6.8.4
-babel-runtime@0.1.9_1
+babel-compiler@6.9.1
+babel-runtime@0.1.11
 base64@1.0.9
 binary-heap@1.0.9
 blaze@2.1.8
 blaze-html-templates@1.0.4
 blaze-tools@1.0.9
 boilerplate-generator@1.0.9
-caching-compiler@1.0.6
+caching-compiler@1.1.7
 caching-html-compiler@1.0.6
 callback-hook@1.0.9
 check@1.2.3
-coffeescript@1.1.3
+coffeescript@1.2.4_1
 ddp@1.2.5
 ddp-client@1.2.9
 ddp-common@1.2.6
-ddp-server@1.2.9
+ddp-server@1.2.10
 deps@1.0.12
 diff-sequence@1.0.6
-ecmascript@0.4.7
-ecmascript-runtime@0.2.12
+ecmascript@0.5.8
+ecmascript-runtime@0.3.14
 ejson@1.0.12
-es5-shim@4.5.13
+es5-shim@4.6.14
 fastclick@1.0.12
 geojson-utils@1.0.9
 hot-code-push@1.0.4
 html-tools@1.0.10
 htmljs@1.0.10
-http@1.1.8
+http@1.2.9
 id-map@1.0.8
 jquery@1.11.9
 launch-screen@1.0.12
 livedata@1.0.18
-logging@1.0.14
-meteor@1.1.16
+logging@1.1.15
+meteor@1.2.17
 meteor-base@1.0.4
-minifier-css@1.1.13
-minifier-js@1.1.13
+minifier-css@1.2.14
+minifier-js@1.2.14
 minimongo@1.0.17
 mobile-experience@1.0.4
 mobile-status-bar@1.0.12
-modules@0.6.5
-modules-runtime@0.6.5
-mongo@1.1.9_1
+modules@0.7.6
+modules-runtime@0.7.6
+mongo@1.1.12
 mongo-id@1.0.5
-npm-mongo@1.4.45
+npm-mongo@1.5.48
 observe-sequence@1.0.12
 ordered-dict@1.0.8
-ostrio:cookies@2.0.4
-ostrio:files@1.6.4
-promise@0.7.3
+ostrio:cookies@2.0.5
+ostrio:files@1.7.2
+promise@0.8.4
 random@1.0.10
 reactive-var@1.0.10
 reload@1.1.10
 retry@1.0.8
 routepolicy@1.0.11
+shell-server@0.2.1
 spacebars@1.0.12
 spacebars-compiler@1.0.12
-standard-minifier-css@1.0.8
-standard-minifier-js@1.0.8
-templating@1.1.13
+standard-minifier-css@1.2.0
+standard-minifier-js@1.2.0
+templating@1.2.14
 templating-tools@1.0.4
-tracker@1.0.14
+tracker@1.1.0
 ui@1.0.11
 underscore@1.0.9
 url@1.0.10
-webapp@1.2.10
+webapp@1.3.11
 webapp-hashing@1.0.9
diff --git a/demo-simplest-upload/.meteor/.finished-upgraders b/demo-simplest-upload/.meteor/.finished-upgraders
index dacc2c0d..aa607041 100644
--- a/demo-simplest-upload/.meteor/.finished-upgraders
+++ b/demo-simplest-upload/.meteor/.finished-upgraders
@@ -11,3 +11,5 @@ notices-for-facebook-graph-api-2
 1.2.0-cordova-changes
 1.2.0-breaking-changes
 1.3.0-split-minifiers-package
+1.4.0-remove-old-dev-bundle-link
+1.4.1-add-shell-server-package
diff --git a/demo-simplest-upload/.meteor/packages b/demo-simplest-upload/.meteor/packages
index 857d4df6..2d370b1b 100644
--- a/demo-simplest-upload/.meteor/packages
+++ b/demo-simplest-upload/.meteor/packages
@@ -4,18 +4,19 @@
 # 'meteor add' and 'meteor remove' will edit this file for you,
 # but you can also edit it by hand.
 
-meteor-base             # Packages every Meteor app needs to have
-mobile-experience       # Packages for a great mobile UX
-mongo                   # The database Meteor supports right now
-blaze-html-templates    # Compile .html files into Meteor Blaze views
-reactive-var            # Reactive variable for tracker
-jquery                  # Helpful client-side library
-tracker                 # Meteor's client-side reactive programming library
+meteor-base@1.0.4             # Packages every Meteor app needs to have
+mobile-experience@1.0.4       # Packages for a great mobile UX
+mongo@1.1.12                   # The database Meteor supports right now
+blaze-html-templates@1.0.4    # Compile .html files into Meteor Blaze views
+reactive-var@1.0.10            # Reactive variable for tracker
+jquery@1.11.9                  # Helpful client-side library
+tracker@1.1.0                 # Meteor's client-side reactive programming library
 
-standard-minifier-css   # CSS minifier run for production mode
-standard-minifier-js    # JS minifier run for production mode
-es5-shim                # ECMAScript 5 compatibility for older browsers.
-ecmascript              # Enable ECMAScript2015+ syntax in app code
+standard-minifier-css@1.2.0   # CSS minifier run for production mode
+standard-minifier-js@1.2.0    # JS minifier run for production mode
+es5-shim@4.6.14                # ECMAScript 5 compatibility for older browsers.
+ecmascript@0.5.8              # Enable ECMAScript2015+ syntax in app code
 
 ostrio:files
 ostrio:templatehelpers
+shell-server
diff --git a/demo-simplest-upload/.meteor/release b/demo-simplest-upload/.meteor/release
index f80cc1ce..72980bc2 100644
--- a/demo-simplest-upload/.meteor/release
+++ b/demo-simplest-upload/.meteor/release
@@ -1 +1 @@
-METEOR@1.3.4.1
+METEOR@1.4.1.1
diff --git a/demo-simplest-upload/.meteor/versions b/demo-simplest-upload/.meteor/versions
index 1cc34300..c681b7a2 100644
--- a/demo-simplest-upload/.meteor/versions
+++ b/demo-simplest-upload/.meteor/versions
@@ -1,71 +1,72 @@
 allow-deny@1.0.5
-autoupdate@1.2.10
-babel-compiler@6.8.3
-babel-runtime@0.1.9_1
+autoupdate@1.2.11
+babel-compiler@6.9.1
+babel-runtime@0.1.11
 base64@1.0.9
 binary-heap@1.0.9
 blaze@2.1.8
 blaze-html-templates@1.0.4
 blaze-tools@1.0.9
 boilerplate-generator@1.0.9
-caching-compiler@1.0.5_1
+caching-compiler@1.1.7
 caching-html-compiler@1.0.6
 callback-hook@1.0.9
 check@1.2.3
-coffeescript@1.1.2_1
+coffeescript@1.2.4_1
 ddp@1.2.5
-ddp-client@1.2.8_1
+ddp-client@1.2.9
 ddp-common@1.2.6
-ddp-server@1.2.8_1
+ddp-server@1.2.10
 deps@1.0.12
 diff-sequence@1.0.6
-ecmascript@0.4.6_1
-ecmascript-runtime@0.2.11_1
+ecmascript@0.5.8
+ecmascript-runtime@0.3.14
 ejson@1.0.12
-es5-shim@4.5.12_1
+es5-shim@4.6.14
 fastclick@1.0.12
 geojson-utils@1.0.9
 hot-code-push@1.0.4
 html-tools@1.0.10
 htmljs@1.0.10
-http@1.1.7
+http@1.2.9
 id-map@1.0.8
 jquery@1.11.9
 launch-screen@1.0.12
 livedata@1.0.18
-logging@1.0.13_1
-meteor@1.1.15_1
+logging@1.1.15
+meteor@1.2.17
 meteor-base@1.0.4
-minifier-css@1.1.12_1
-minifier-js@1.1.12_1
+minifier-css@1.2.14
+minifier-js@1.2.14
 minimongo@1.0.17
 mobile-experience@1.0.4
 mobile-status-bar@1.0.12
-modules@0.6.4
-modules-runtime@0.6.4_1
-mongo@1.1.9_1
+modules@0.7.6
+modules-runtime@0.7.6
+mongo@1.1.12
 mongo-id@1.0.5
-npm-mongo@1.4.44_1
+npm-mongo@1.5.48
 observe-sequence@1.0.12
 ordered-dict@1.0.8
-ostrio:cookies@2.0.4
-ostrio:files@1.6.2
-ostrio:templatehelpers@1.1.2
-promise@0.7.2_1
+ostrio:cookies@2.0.5
+ostrio:files@1.7.2
+ostrio:templatehelpers@1.1.3
+promise@0.8.4
 random@1.0.10
 reactive-var@1.0.10
 reload@1.1.10
 retry@1.0.8
 routepolicy@1.0.11
+shell-server@0.2.1
 spacebars@1.0.12
 spacebars-compiler@1.0.12
-standard-minifier-css@1.0.7_1
-standard-minifier-js@1.0.7_1
-templating@1.1.12_1
+standard-minifier-css@1.2.0
+standard-minifier-js@1.2.0
+templating@1.2.14
 templating-tools@1.0.4
-tracker@1.0.14
+tracker@1.1.0
 ui@1.0.11
 underscore@1.0.9
 url@1.0.10
-webapp@1.2.9_1
+webapp@1.3.11
 webapp-hashing@1.0.9
diff --git a/demo-simplest-upload/lib/images.collection.js b/demo-simplest-upload/lib/images.collection.js
index c55740b0..79785f69 100644
--- a/demo-simplest-upload/lib/images.collection.js
+++ b/demo-simplest-upload/lib/images.collection.js
@@ -4,7 +4,7 @@ this.Images = new Meteor.Files({
   allowClientCode: false, // Disallow remove files from Client
   onBeforeUpload: function (file) {
     // Allow upload files under 10MB, and only in png/jpg/jpeg formats
-    if (file.size <= 10485760 && /png|jpg|jpeg/i.test(file.extension)) {
+    if (file.size <= 1024*1024*10 && /png|jpg|jpeg/i.test(file.extension)) {
       return true;
     } else {
       return 'Please upload image, with size equal or less than 10MB';
diff --git a/demo/.meteor/versions b/demo/.meteor/versions
index 199e068e..d633180b 100644
--- a/demo/.meteor/versions
+++ b/demo/.meteor/versions
@@ -73,15 +73,15 @@ mongo-id@1.0.5
 mquandalle:jade@0.4.9
 mquandalle:jade-compiler@0.4.5
 mrt:filesize@2.0.3
-npm-mongo@1.5.48
+npm-mongo@1.5.49
 oauth@1.1.11
 oauth1@1.1.10
 oauth2@1.1.10
 observe-sequence@1.0.12
 ordered-dict@1.0.8
 ostrio:cookies@2.0.5
-ostrio:cstorage@2.0.6
-ostrio:files@1.7.1
+ostrio:cstorage@2.1.0
+ostrio:files@1.7.3
 ostrio:flow-router-extra@2.12.2
 ostrio:flow-router-meta@1.1.1
 ostrio:flow-router-title@2.1.1
diff --git a/docs/google-cloud-storage-integration.md b/docs/google-cloud-storage-integration.md
index 22359c91..9f9b30a0 100644
--- a/docs/google-cloud-storage-integration.md
+++ b/docs/google-cloud-storage-integration.md
@@ -72,27 +72,29 @@ Collections.files = new FilesCollection({
       };
 
       bucket.upload(fileRef.path, options, function(error, file){
-        var upd;
-        if (error) {
-          console.error(error);
-        } else {
-          upd = {
-            $set: {}
-          };
-          upd['$set']["versions." + version + ".meta.pipeFrom"] = bucketMetadata.selfLink + '/' + filePath;
-          upd['$set']["versions." + version + ".meta.pipePath"] = filePath;
-          self.collection.update({
-            _id: fileRef._id
-          }, upd, function (error) {
-            if (error) {
-              console.error(error);
-            } else {
-              // Unlink original files from FS
-              // after successful upload to Google Cloud Storage
-              self.unlink(self.collection.findOne(fileRef._id), version);
-            }
-          });
-        }
+        bound(function(){
+          var upd;
+          if (error) {
+            console.error(error);
+          } else {
+            upd = {
+              $set: {}
+            };
+            upd['$set']["versions." + version + ".meta.pipeFrom"] = bucketMetadata.selfLink + '/' + filePath;
+            upd['$set']["versions." + version + ".meta.pipePath"] = filePath;
+            self.collection.update({
+              _id: fileRef._id
+            }, upd, function (error) {
+              if (error) {
+                console.error(error);
+              } else {
+                // Unlink original files from FS
+                // after successful upload to Google Cloud Storage
+                self.unlink(self.collection.findOne(fileRef._id), version);
+              }
+            });
+          }
+        });
       });
     });
   },
diff --git a/files.coffee b/files.coffee
index 58b60d70..32ea27ce 100755
--- a/files.coffee
+++ b/files.coffee
@@ -524,17 +524,13 @@ class FilesCollection
           cookie.send()
         return
 
-      Tracker.autorun ->
-        if Meteor.status().connected
+      if Accounts?
+        Accounts.onLogin ->
           setTokenCookie()
-        else
+          return
+        Accounts.onLogout ->
           unsetTokenCookie()
-        return
-
-      if Meteor.connection._lastSessionId
-        setTokenCookie()
-      else
-        unsetTokenCookie()
+          return
 
       check @onbeforeunloadMessage, Match.OneOf String, Function
 
@@ -700,18 +696,15 @@ class FilesCollection
 
     @_checkAccess = (http) ->
       if self.protected
-        user = false
-        userFuncs = self._getUser http
-        {user, userId} = userFuncs
-        user = user()
+        {user, userId} = self._getUser http
 
         if _.isFunction self.protected
           if http?.params?._id
             fileRef = self.collection.findOne http.params._id
 
-          result = if http then self.protected.call(_.extend(http, userFuncs), (fileRef or null)) else self.protected.call userFuncs, (fileRef or null)
+          result = if http then self.protected.call(_.extend(http, {user, userId}), (fileRef or null)) else self.protected.call {user, userId}, (fileRef or null)
         else
-          result = !!user
+          result = !!userId
 
         if (http and result is true) or not http
           return true
@@ -1137,7 +1130,7 @@ class FilesCollection
         if mtok
           userId = Meteor.server.sessions?[mtok]?.userId
           if userId
-            result.user   = -> return Meteor.users.findOne userId
+            result.user   = -> Meteor.users.findOne userId
             result.userId = userId
     else
       if Meteor.userId?()
@@ -1445,10 +1438,11 @@ class FilesCollection
   @summary Find and return Cursor for matching document Object
   @returns {FileCursor} Instance
   ###
-  findOne: (selector = {}, options) ->
+  findOne: (selector, options) ->
     console.info "[FilesCollection] [findOne(#{JSON.stringify(selector)}, #{JSON.stringify(options)})]" if @debug
-    check selector, Match.OneOf Object, String
+    check selector, Match.Optional Match.OneOf Object, String, Boolean, null
     check options, Match.Optional Object
+
     doc = @collection.findOne selector, options
     return if doc then new FileCursor(doc, @) else doc
 
@@ -1665,6 +1659,14 @@ class FilesCollection
         binData: evt.data.bin
         chunkId: evt.data.chunkId
 
+      if @config.isBase64
+        pad = opts.binData.length % 4
+        if pad
+          p = 0
+          while p < pad
+            opts.binData += '='
+            p++
+
       @emitEvent 'data', [evt.data.bin]
       if @pipes.length
         for pipeFunc in @pipes
@@ -1825,8 +1827,13 @@ class FilesCollection
         if @config.transport is 'http'
           @config.chunkSize = Math.round @config.chunkSize / 2
 
-      @config.chunkSize = Math.floor(@config.chunkSize / 8) * 8
-      _len = Math.ceil(@fileData.size / @config.chunkSize)
+      if @config.isBase64
+        @config.chunkSize = Math.floor(@config.chunkSize / 4) * 4
+        _len = Math.ceil(@config.file.length / @config.chunkSize)
+      else
+        @config.chunkSize = Math.floor(@config.chunkSize / 8) * 8
+        _len = Math.ceil(@fileData.size / @config.chunkSize)
+
       if @config.streams is 'dynamic'
         @config.streams = _.clone _len
         @config.streams = 24 if @config.streams > 24
diff --git a/package.js b/package.js
index 91536eb6..2000ab34 100755
--- a/package.js
+++ b/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ostrio:files',
-  version: '1.7.2',
+  version: '1.7.3',
   summary: 'Upload files via DDP, HTTP and WebRTC/DC. To server FS, AWS, GridFS, DropBox or Google Drive.',
   git: 'https://github.com/VeliovGroup/Meteor-Files',
   documentation: 'README.md'