diff --git a/client/imports/views/layouts/navigation/navigation.html b/client/imports/views/layouts/navigation/navigation.html
index bca356a9766cabf7810e06a0f5a627947f345ff8..5d5cc162e8dac75d8026af1ec2d521ba3efc2ab0 100644
--- a/client/imports/views/layouts/navigation/navigation.html
+++ b/client/imports/views/layouts/navigation/navigation.html
@@ -124,7 +124,8 @@
                             </li>
 
                             <li class="{{isActivePath regex='schemaAnalyzer'}}">
-                                <a class="aNavigations" href="{{pathFor route='schemaAnalyzer'}}"><i
+                                <a id="anchorSchemaAnalyzer" class="aNavigations"
+                                   href="{{pathFor route='schemaAnalyzer'}}"><i
                                         class="fa fa-braille"></i> <span
                                         class="nav-label">Schema Analyzer</span>
                                 </a>
diff --git a/client/imports/views/layouts/navigation/navigation.js b/client/imports/views/layouts/navigation/navigation.js
index d20209bf949d52973c3a83a607b801c9f234177c..c4eff97dea3015d9a167c84c63ffddac87258ce3 100644
--- a/client/imports/views/layouts/navigation/navigation.js
+++ b/client/imports/views/layouts/navigation/navigation.js
@@ -6,6 +6,7 @@ import {Session} from "meteor/session";
 import {FlowRouter} from "meteor/kadira:flow-router";
 import {Connections} from "/lib/imports/collections/connections";
 import Helper from "/client/imports/helper";
+import Enums from "/lib/imports/enums";
 import {connect} from "/client/imports/views/layouts/top_navbar/connections/connections";
 import {initializeForm, resetForm} from "./add_collection/add_collection";
 import {resetForm as resetCappedForm} from "./convert_capped_collection/convert_to_capped";
@@ -120,6 +121,23 @@ export const renderCollectionNames = function () {
     });
 };
 
+const showMongoBinaryInfo = function () {
+    if (!localStorage.getItem(Enums.LOCAL_STORAGE_KEYS.MONGO_BINARY_INFO)) {
+        swal({
+            title: "Mongo Binary",
+            text: "Mongo executable to be used on shell and schema analyzer is configurable, you can change it from <b>Settings</b>",
+            type: "info",
+            html: true,
+            confirmButtonColor: "#18A689",
+            confirmButtonText: "Cool, don't show again!"
+        }, function (isConfirm) {
+            if (isConfirm) {
+                localStorage.setItem(Enums.LOCAL_STORAGE_KEYS.MONGO_BINARY_INFO, "true");
+            }
+        });
+    }
+};
+
 Template.navigation.events({
     'click #anchorShell'(e) {
         e.preventDefault();
@@ -131,6 +149,11 @@ Template.navigation.events({
         }
 
         FlowRouter.go('/shell');
+        showMongoBinaryInfo();
+    },
+
+    'click #anchorSchemaAnalyzer'() {
+        showMongoBinaryInfo();
     },
 
     'click #anchorDatabaseDumpRestore'(e) {
diff --git a/client/imports/views/pages/mc_shell/mc_shell.js b/client/imports/views/pages/mc_shell/mc_shell.js
index 2b25d084e61bce7b7aa49562321b2bae33a10566..d78d137b880d7f3d5fa665931989ddb1059e7ee2 100644
--- a/client/imports/views/pages/mc_shell/mc_shell.js
+++ b/client/imports/views/pages/mc_shell/mc_shell.js
@@ -160,8 +160,8 @@ const initializeCommandCodeMirror = function () {
             let regex = new RegExp('^' + curWord, 'i');
             return {
                 list: (!curWord ? list : list.filter(function (item) {
-                    return item.match(regex);
-                })),
+                        return item.match(regex);
+                    })),
                 from: CodeMirror.Pos(cursor.line, start),
                 to: CodeMirror.Pos(cursor.line, end)
             };
diff --git a/client/imports/views/pages/settings/settings.html b/client/imports/views/pages/settings/settings.html
index 4d7bd7b88691378cb48da63e2c728cd153ed6f1d..27dd07fe3e1a491b2f7f4f788a10d73f02480a7a 100644
--- a/client/imports/views/pages/settings/settings.html
+++ b/client/imports/views/pages/settings/settings.html
@@ -167,6 +167,17 @@
                                 </div>
                             </div>
 
+                            <div class="form-group">
+                                <label class="col-lg-3 control-label">Mongo executable path</label>
+                                <div class="col-lg-9">
+                                    <input id="inputMongoExecutable" required="true" type="file"
+                                           class="form-control filestyle">
+                                    <span class="help-block m-b-none">
+                                        <b>By default</b> Mongoclient uses an internal <b>Mongo</b> binary regarding to your OS, you can assign another binary with this setting
+                                    </span>
+                                </div>
+                            </div>
+
                             <div class="form-group">
                                 <div class="col-lg-12">
                                     <button id="btnSaveSettings"
diff --git a/client/imports/views/pages/settings/settings.js b/client/imports/views/pages/settings/settings.js
index e07b4d57d68e7ac2630c704dad128861178ec6b8..576001fcd49d9fbae4696af0693c4704f6965002 100644
--- a/client/imports/views/pages/settings/settings.js
+++ b/client/imports/views/pages/settings/settings.js
@@ -1,6 +1,6 @@
 import {Template} from "meteor/templating";
-import {Meteor} from "meteor/meteor";
 import {Settings} from "/lib/imports/collections/settings";
+import {loadFile} from "/client/imports/views/layouts/top_navbar/top_navbar";
 import "./settings.html";
 
 const toastr = require('toastr');
@@ -9,7 +9,7 @@ const Ladda = require('ladda');
  * Created by RSercan on 9.1.2016.
  */
 
-const getSettingsFromForm = function () {
+const proceedSavingSettings = function (mongoBinary) {
     const settings = {};
     settings.autoCompleteFields = $('#divAutoCompleteFields').iCheck('update')[0].checked;
     settings.scale = $("#cmbScale").chosen().val();
@@ -21,15 +21,21 @@ const getSettingsFromForm = function () {
     settings.showDBStats = $('#divShowDBStats').iCheck('update')[0].checked;
     settings.showLiveChat = $('#divShowLiveChat').iCheck('update')[0].checked;
     settings.dumpPath = $('#inputDumpPath').val();
+    settings.mongoBinaryName = $('#inputMongoExecutable').siblings('.bootstrap-filestyle').children('input').val() || 'mongo';
     settings.singleTabResultSets = $('#divUseSingleTab').iCheck('update')[0].checked;
-    return settings;
+
+    Meteor.call('updateSettings', settings, mongoBinary, function (err) {
+        if (err) this.showMeteorFuncError(err, null, "Couldn't save");
+        else toastr.success('Successfuly saved !');
+        Ladda.stopAll();
+    });
 };
 
 Template.settings.onRendered(function () {
     $('#divAutoCompleteFields, #divShowDBStats, #divShowLiveChat, #divUseSingleTab').iCheck({
         checkboxClass: 'icheckbox_square-green'
     });
-
+    $('.filestyle').filestyle({});
     $('#cmbScale, #cmbResultView').chosen();
 
     let settings = this.subscribe('settings');
@@ -47,12 +53,7 @@ Template.settings.events({
         e.preventDefault();
 
         Ladda.create(document.querySelector('#btnSaveSettings')).start();
-
-        Meteor.call('updateSettings', getSettingsFromForm());
-        toastr.success('Successfuly saved !');
-
-
-        Ladda.stopAll();
+        loadFile(Settings.findOne().mongoBinary, $('#inputMongoExecutable'), proceedSavingSettings);
     }
 });
 
@@ -61,15 +62,6 @@ const load = function () {
     const settings = Settings.findOne();
     const cmbScale = $('#cmbScale');
     const cmbResultView = $('#cmbResultView');
-    const inputMaxAllowedFetchSize = $('#inputMaxAllowedFetchSize');
-    const inputSocketTimeout = $('#inputSocketTimeout');
-    const inputConnectionTimeout = $('#inputConnectionTimeout');
-    const inputDBStatsScheduler = $('#inputDBStatsScheduler');
-    const inputAutoCompleteFields = $('#inputAutoCompleteFields');
-    const inputShowLiveChat = $('#inputShowLiveChat');
-    const inputShowDBStats = $('#inputShowDBStats');
-    const inputDumpPath = $('#inputDumpPath');
-    const inputUseSingleTab = $('#inputUseSingleTab');
 
     cmbScale.val(settings.scale);
     cmbScale.trigger("chosen:updated");
@@ -77,30 +69,15 @@ const load = function () {
     cmbResultView.val(settings.defaultResultView);
     cmbResultView.trigger("chosen:updated");
 
-    if (settings.dumpPath) inputDumpPath.val(settings.dumpPath);
-
-    if (settings.maxAllowedFetchSize) inputMaxAllowedFetchSize.val(settings.maxAllowedFetchSize);
-    else inputMaxAllowedFetchSize.val(0);
-
-    if (settings.socketTimeoutInSeconds) inputSocketTimeout.val(settings.socketTimeoutInSeconds);
-    else inputSocketTimeout.val(0);
-
-    if (settings.connectionTimeoutInSeconds) inputConnectionTimeout.val(settings.connectionTimeoutInSeconds);
-    else inputConnectionTimeout.val(0);
-
-    if (settings.dbStatsScheduler) inputDBStatsScheduler.val(settings.dbStatsScheduler);
-    else inputDBStatsScheduler.val(3000);
-
-    if (settings.autoCompleteFields) inputAutoCompleteFields.iCheck('check');
-    else inputAutoCompleteFields.iCheck('uncheck');
-
-    if (settings.showLiveChat) inputShowLiveChat.iCheck('check');
-    else inputShowLiveChat.iCheck('uncheck');
-
-    if (settings.singleTabResultSets) inputUseSingleTab.iCheck('check');
-    else inputUseSingleTab.iCheck('uncheck');
-
-    if (settings.showDBStats) inputShowDBStats.iCheck('check');
-    else inputShowDBStats.iCheck('uncheck');
+    $('#inputDumpPath').val(settings.dumpPath || '');
+    $('#inputMaxAllowedFetchSize').val(settings.maxAllowedFetchSize || 0);
+    $('#inputSocketTimeout').val(settings.socketTimeoutInSeconds || 0);
+    $('#inputConnectionTimeout').val(settings.connectionTimeoutInSeconds || 0);
+    $('#inputDBStatsScheduler').val(settings.dbStatsScheduler || 3000);
+    $('#inputAutoCompleteFields').iCheck(settings.autoCompleteFields ? 'check' : 'uncheck');
+    $('#inputShowLiveChat').iCheck(settings.showLiveChat ? 'check' : 'uncheck');
+    $('#inputUseSingleTab').iCheck(settings.singleTabResultSets ? 'check' : 'uncheck');
+    $('#inputShowDBStats').iCheck(settings.showDBStats ? 'check' : 'uncheck');
+    $('#inputMongoExecutable').siblings('.bootstrap-filestyle').children('input').val(settings.mongoBinaryName || 'mongo');
 
 };
\ No newline at end of file
diff --git a/lib/imports/enums.js b/lib/imports/enums.js
index 6a0908d9b4aa7c6d70828fe65d5155b39756d313..31fcc4dbe5bba8f7e4ba5a27e925024aa386e4a9 100644
--- a/lib/imports/enums.js
+++ b/lib/imports/enums.js
@@ -2,6 +2,10 @@
  * Created by RSercan on 29.12.2015.
  */
 let Enums = function () {
+    this.LOCAL_STORAGE_KEYS = {
+        MONGO_BINARY_INFO: 'mongoclient-mongo-binary-warn'
+    };
+
     this.QUERY_TYPES = {
         BULK_WRITE: "bulkWrite",
         FIND: "find",
diff --git a/server/imports/internal/internal_methods.js b/server/imports/internal/internal_methods.js
index 3374ef2170ea9507d42bb9f6e5269cb2d2040d3b..3ebac83212b8065646d0701356d59d946b9ccb5e 100644
--- a/server/imports/internal/internal_methods.js
+++ b/server/imports/internal/internal_methods.js
@@ -12,7 +12,7 @@ import SchemaAnalyzeResult from "/lib/imports/collections/schema_analyze_result"
 import {HTTP} from "meteor/http";
 import LOGGER from "../internal/logger";
 
-
+const fs = require('fs');
 const packageJson = require('/package.json');
 const mongodbUrlParser = require('parse-mongo-url');
 
@@ -186,10 +186,23 @@ Meteor.methods({
         Dumps.insert(dump);
     },
 
-    updateSettings(settings) {
-        LOGGER.info('[updateSettings]', JSON.stringify(settings));
-        Settings.remove({});
-        Settings.insert(settings);
+    updateSettings(settings, mongoBinary) {
+        try {
+            LOGGER.info('[updateSettings]', JSON.stringify(settings));
+
+            if (mongoBinary) {
+                let currentDir = process.cwd().replace(/\\/g, '/');
+                currentDir = currentDir.substring(0, currentDir.lastIndexOf("/")) + '/web.browser/app/mongo/';
+                fs.chmodSync(currentDir, '777');
+                fs.writeFileSync(currentDir + "user_mongo", new Buffer(mongoBinary), {mode: '777'});
+            }
+            Settings.remove({});
+            Settings.insert(settings);
+        }
+        catch (ex) {
+            LOGGER.error('[updateSettings]', ex);
+            throw new Meteor.Error(ex.message);
+        }
     },
 
     saveConnection(connection) {
diff --git a/server/imports/mongodb/methods_common.js b/server/imports/mongodb/methods_common.js
index 58c506176fa9cf6b881502106e4c97ca1a3c1824..dfa77efc5b2633d4e36a2434927e642ff6fe6ca7 100644
--- a/server/imports/mongodb/methods_common.js
+++ b/server/imports/mongodb/methods_common.js
@@ -82,6 +82,10 @@ const getMongoExternalsPath = function () {
 
 const getProperMongo = function () {
     let currentDir = getMongoExternalsPath();
+    if (fs.existsSync(currentDir + "user_mongo")) {
+        LOGGER.info('[userMongo]', 'found a mongo binary set by user, choosing it');
+        return currentDir + "user_mongo";
+    }
     switch (os.platform()) {
         case 'darwin':
             return currentDir + 'darwin/mongo';