diff --git a/microscript/ILibDuktape_Polyfills.c b/microscript/ILibDuktape_Polyfills.c
index dbe2fe0..b59a2bd 100644
--- a/microscript/ILibDuktape_Polyfills.c
+++ b/microscript/ILibDuktape_Polyfills.c
@@ -2230,7 +2230,7 @@ void ILibDuktape_Polyfills_JS_Init(duk_context *ctx)
 	duk_peval_string_noresult(ctx, "addCompressedModule('clipboard', Buffer.from('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', 'base64'));");
 
 	// Promise: This is very important, as it is used everywhere. Refer to /modules/promise.js to see a human readable version of promise.js
-	duk_peval_string_noresult(ctx, "addCompressedModule('promise', Buffer.from('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', 'base64'));");
+	duk_peval_string_noresult(ctx, "addModule('promise', Buffer.from('/*
Copyright 2018 Intel Corporation

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

    http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

var refTable = {};

function getRootPromise(obj)
{
    while(obj.parentPromise)
    {
        obj = obj.parentPromise;
    }
    return (obj);
}

function event_switcher_helper(desired_callee, target, forward)
{
    this._ObjectID = 'event_switcher';
    this.func = function func()
    {
        var args = [];
        if (func.forward != null) { args.push(func.forward); }
        for(var i in arguments)
        {
            args.push(arguments[i]);
        }
        return (func.target.apply(func.desired, args));
    };
    this.func.desired = desired_callee;
    this.func.target = target;
    this.func.forward = forward;
    this.func.self = this;
}
function event_switcher(desired_callee, target)
{
    return (new event_switcher_helper(desired_callee, target));
}

function event_forwarder(sourceObj, sourceName, targetObj, targetName)
{
    sourceObj.on(sourceName,   (new event_switcher_helper(targetObj, targetObj.emit, targetName)).func);      
}

function Promise(promiseFunc)
{
    this._ObjectID = 'promise';
    this.promise = this;
    this._internal = { _ObjectID: 'promise.internal', promise: this, func: promiseFunc, completed: false, errors: false, completedArgs: [], internalCount: 0, _up: null };
    require('events').EventEmitter.call(this._internal);
    Object.defineProperty(this, "parentPromise",
        {
            get: function () { return (this._up); },
            set: function (value)
            {
                if (value != null && this._up == null)
                {
                    // We are no longer an orphan
                    if (this._internal.uncaught != null)
                    {
                        clearImmediate(this._internal.uncaught);
                        this._internal.uncaught = null;
                    }
                }
                this._up = value;
            }
        });



    this._internal.on('newListener', function (eventName, eventCallback)
    {
        //console.log('newListener', eventName, 'errors/' + this.errors + ' completed/' + this.completed);
        var r = null;

        if (eventName == 'resolved' && !this.errors && this.completed)
        {
            r = eventCallback.apply(this, this.completedArgs);
            if(r!=null)
            {
                this.emit_returnValue('resolved', r);
            }
        }

        if (eventName == 'rejected' && (eventCallback.internal == null || eventCallback.internal == false))
        {
            var rp = getRootPromise(this.promise);
            rp._internal.external = true;
            if (this.uncaught != null)
            {
                clearImmediate(this.uncaught);
                this.uncaught = null;
            }
            if (rp._internal.uncaught != null)
            {
                clearImmediate(rp._internal.uncaught);
                rp._internal.uncaught = null;
            }
        }

        if (eventName == 'rejected' && this.errors && this.completed)
        {
            eventCallback.apply(this, this.completedArgs);
        }
        if (eventName == 'settled' && this.completed)
        {
            eventCallback.apply(this, []);
        }
    });
    this._internal.resolver = function _resolver()
    {
        if (_resolver._self.completed) { return; }
        _resolver._self.errors = false;
        _resolver._self.completed = true;
        _resolver._self.completedArgs = [];
        var args = ['resolved'];
        if (this.emit_returnValue && this.emit_returnValue('resolved') != null)
        {
            _resolver._self.completedArgs.push(this.emit_returnValue('resolved'));
            args.push(this.emit_returnValue('resolved'));
        }
        else
        {
            for (var a in arguments)
            {
                _resolver._self.completedArgs.push(arguments[a]);
                args.push(arguments[a]);
            }
        }
        if (args.length == 2 && args[1]!=null && typeof(args[1]) == 'object' && args[1]._ObjectID == 'promise')
        {
            var pr = getRootPromise(_resolver._self.promise);
            args[1]._XSLF = _resolver._self;
            args[1].then(function _returnResolved()
            {
                var parms = ['resolved'];
                for (var ai in arguments)
                {
                    parms.push(arguments[ai]);
                }
                this._XSLF.emit.apply(this._XSLF, parms);
            },
            function _returnRejected(e)
            {
                this._XSLF.promise.__childPromise._rej(e);
            });
        }
        else
        {
            _resolver._self.emit.apply(_resolver._self, args);
            _resolver._self.emit('settled');
        }
    };
    this._internal.rejector = function _rejector()
    {
        if (_rejector._self.completed) { return; }
        _rejector._self.errors = true;
        _rejector._self.completed = true;
        _rejector._self.completedArgs = [];
        var args = ['rejected'];
        for (var a in arguments)
        {
            _rejector._self.completedArgs.push(arguments[a]);
            args.push(arguments[a]);
        }

        var r = getRootPromise(_rejector._self.promise);
        if ((r._internal.external == null || r._internal.external == false) && r._internal.uncaught == null)
        {
            r._internal.uncaught = setImmediate(function (a) 
            {
                process.emit('uncaughtException', 'promise.uncaughtRejection: ' + JSON.stringify(a));
            }, arguments[0]);
        }

        _rejector._self.emit.apply(_rejector._self, args);
        _rejector._self.emit('settled');
    };
    this._internal.rejector.internal = true;

    this.catch = function(func)
    {
        var rt = getRootPromise(this);
        this._internal.once('rejected', event_switcher(this, func).func);
    }
    this.finally = function (func)
    {
        this._internal.once('settled', event_switcher(this, func).func);
    };
    this.then = function (resolved, rejected)
    {
        if (resolved) { this._internal.once('resolved', event_switcher(this, resolved).func); }
        if (rejected)
        {
            this._internal.once('rejected', event_switcher(this, rejected).func);
        }
                      
        var retVal = new Promise(function (r, j) { this._rej = j; });
        retVal.parentPromise = this;

        if (this._internal.completed)
        {
            // This promise was already resolved, so lets check if the handler returned a promise
            var rv = this._internal.emit_returnValue('resolved');
            if(rv!=null)
            {
                if(rv._ObjectID == 'promise')
                {
                    rv.parentPromise = this;
                    rv._internal.once('resolved', retVal._internal.resolver);
                    rv._internal.once('rejected', retVal._internal.rejector);
                }
                else
                {
                    retVal._internal.resolver(rv);
                }
            }
            else
            {
                this._internal.once('resolved', retVal._internal.resolver);
                this._internal.once('rejected', retVal._internal.rejector);
            }
        }
        else
        {
            this._internal.once('resolved', retVal._internal.resolver);
            this._internal.once('rejected', retVal._internal.rejector);
        }
        this.__childPromise = retVal;
        return (retVal);
    };

    this._internal.resolver._self = this._internal;
    this._internal.rejector._self = this._internal;;

    try
    {
        promiseFunc.call(this, this._internal.resolver, this._internal.rejector);
    }
    catch(e)
    {
        this._internal.errors = true;
        this._internal.completed = true;
        this._internal.completedArgs = [e];
        this._internal.emit('rejected', e);
        this._internal.emit('settled');
    }

    if(!this._internal.completed)
    {
        // Save reference of this object
        refTable[this._internal._hashCode()] = this._internal;
        this._internal.once('settled', function () { refTable[this._hashCode()] = null; });
    }
    Object.defineProperty(this, "completed", {
        get: function ()
        {
            return (this._internal.completed);
        }
    });
}

Promise.resolve = function resolve()
{
    var retVal = new Promise(function (r, j) { });
    var args = [];
    for (var i in arguments)
    {
        args.push(arguments[i]);
    }
    retVal._internal.resolver.apply(retVal._internal, args);
    return (retVal);
};
Promise.reject = function reject() {
    var retVal = new Promise(function (r, j) { });
    var args = [];
    for (var i in arguments) {
        args.push(arguments[i]);
    }
    retVal._internal.rejector.apply(retVal._internal, args);
    return (retVal);
};
Promise.all = function all(promiseList)
{
    var ret = new Promise(function (res, rej)
    {
        this.__rejector = rej;
        this.__resolver = res;
        this.__promiseList = promiseList;
        this.__done = false;
        this.__count = 0;
    });

    for (var i in promiseList)
    {
        promiseList[i].then(function ()
        {
            // Success
            if(++ret.__count == ret.__promiseList.length)
            {
                ret.__done = true;
                ret.__resolver(ret.__promiseList);
            }
        }, function (arg)
        {
            // Failure
            if(!ret.__done)
            {
                ret.__done = true;
                ret.__rejector(arg);
            }
        });
    }
    if (promiseList.length == 0)
    {
        ret.__resolver(promiseList);
    }
    return (ret);
};

module.exports = Promise;
module.exports.event_switcher = event_switcher;
module.exports.event_forwarder = event_forwarder;', 'base64').toString());");
 
 #ifdef WIN32
 	// Adding win-registry, since it is very useful for windows... Refer to /modules/win-registry.js to see a human readable version
diff --git a/modules/promise.js b/modules/promise.js
index 9af0d16..d37b4a3 100644
--- a/modules/promise.js
+++ b/modules/promise.js
@@ -142,7 +142,7 @@ function Promise(promiseFunc)
         {
             var pr = getRootPromise(_resolver._self.promise);
             args[1]._XSLF = _resolver._self;
-            args[1].then(function ()
+            args[1].then(function _returnResolved()
             {
                 var parms = ['resolved'];
                 for (var ai in arguments)
@@ -151,12 +151,9 @@ function Promise(promiseFunc)
                 }
                 this._XSLF.emit.apply(this._XSLF, parms);
             },
-            function (e)
+            function _returnRejected(e)
             {
-                this._XSLF.promise.__childPromise.parentPromise = null;
                 this._XSLF.promise.__childPromise._rej(e);
-                //var parms = ['rejected', e];
-                //this._XSLF.emit.apply(this._XSLF, parms);
             });
         }
         else