diff --git a/lib/renderer/renderer.js b/lib/renderer/renderer.js
index 693653c..95ea1bc 100644
--- a/lib/renderer/renderer.js
+++ b/lib/renderer/renderer.js
@@ -66,6 +66,7 @@ class Renderer {
         this.internalCache = new Utils.Cache();
         this.head = options.head || {};
         this.data = options.data || {};
+        this.propsData = options.propsData || {};
         this.template = options.template || {};
         const version = Utils.VueVersion(options.vueVersion);
         if (version.enabled) {
@@ -128,6 +129,14 @@ class Renderer {
             return mergedData;
         };
     }
+    /**
+     * @param {Object} oldPropsData
+     * @param {Object} newPropsData
+     * @returns {Function}
+     */
+    FixPropsData(oldPropsData, newPropsData) {
+        return Object.assign({}, oldPropsData, this.propsData, newPropsData);
+    }
     /**
      * @param {string} componentFile
      * @param {string} filePath
@@ -396,15 +405,19 @@ class Renderer {
      *
      * @param {string} filePath
      * @param {Object} data
+     * @param {Object} vueOptions
      * @returns {Promise<{vue: object, css: string, script: string}>}
      */
-    MakeVueClass(filePath, data) {
+    MakeVueClass(filePath, data, vueOptions = {}) {
         return new Promise((resolve, reject) => {
             let cachedBundle = this.internalCache.get(filePath);
             if (cachedBundle) {
                 if (cachedBundle.bundle.data && typeof cachedBundle.bundle.data === "function") {
                     cachedBundle.bundle.data = this.FixData(cachedBundle.bundle.data(), data);
                 }
+                if (vueOptions.propsData && (cachedBundle.bundle.propsData || cachedBundle.bundle.props)) {
+                    cachedBundle.bundle.propsData = this.FixPropsData(cachedBundle.bundle.propsData || {}, vueOptions.propsData);
+                }
                 // @ts-ignore
                 const vue = new Vue(cachedBundle.bundle);
                 const cleanBundle = this._deleteCtor(cachedBundle.bundle);
@@ -425,6 +438,10 @@ class Renderer {
                                 if (bundle.data && typeof bundle.data === "function") {
                                     bundle.data = this.FixData(bundle.data(), data);
                                 }
+                                //Insert propsData
+                                if (vueOptions.propsData && (bundle.propsData || bundle.props)) {
+                                    bundle.propsData = this.FixPropsData(bundle.propsData || {}, vueOptions.propsData);
+                                }
 
                                 //Create Vue Class
                                 // @ts-ignore
@@ -501,7 +518,7 @@ class Renderer {
         return new Promise((resolve, reject) => {
             this.FindFile(vueFile)
                 .then(filePath => {
-                    this.MakeVueClass(filePath, data)
+                    this.MakeVueClass(filePath, data, vueOptions)
                         .then(vueClass => {
                             const mergedHeadObject = Utils.MergeHead(vueOptions.head, this.head);
                             const template = Object.assign({}, this.template, vueOptions.template);
@@ -536,7 +553,7 @@ class Renderer {
         return new Promise((resolve, reject) => {
             this.FindFile(vueFile)
                 .then(filePath => {
-                    this.MakeVueClass(filePath, data)
+                    this.MakeVueClass(filePath, data, vueOptions)
                         .then(vueClass => {
                             const mergedHeadObject = Utils.MergeHead(vueOptions.head, this.head);
                             const headString = Utils.BuildHead(mergedHeadObject);
diff --git a/package.json b/package.json
index c83a4de..fa66680 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "vue-pronto",
-    "version": "1.7.0",
+    "version": "1.7.1",
     "description": "Seriously fast vue server renderer",
     "main": "lib/index.js",
     "files": [
diff --git a/tests/example/views/index/index-with-props.vue b/tests/example/views/index/index-with-props.vue
new file mode 100644
index 0000000..842f90b
--- /dev/null
+++ b/tests/example/views/index/index-with-props.vue
@@ -0,0 +1,51 @@
+<template>
+    <div>
+        <h1 class="red">{{msg}}</h1>
+        <foo hellodata="component"></foo>
+        <p>{{bar}}</p>
+        <div v-html="fakehtml"></div>
+        <h1>{{title}}</h1>
+        <p>Welcome to the {{title}} demo. Click a link:</p>
+        <p>import fooTransitionExpand from '@foo/styles-animation/src/components/foo-transition-expand.vue';</p>
+        <p>const test = require("foo.vue");</p>
+        <p>const bar = require("bar.vue");</p>
+        <input v-model="messageOuter" placeholder="edit me">
+        <button type="button" name="button" v-on:click="hello(messageOuter)">{{messageOuter}}</button>
+        <message-comp :message="messageOuter"></message-comp>
+        <users :users="users"></users>
+        <simple></simple>
+    </div>
+</template>
+
+<script>
+    import foo from "../../components/component.vue";
+    import messageComp from '../../components/message-comp.vue';
+    import users from '../../components/users.vue';
+    import helloMixin from '../../mixins/exampleMixin.js';
+    import simple from 'simple-vue-component-test/simple.vue';
+    export default {
+        props: {
+            msg: {
+                type: String,
+                default: 'Hello world!'
+            },
+            messageOuter: {
+                type: String,
+                default: 'Say Foo'
+            }
+        },
+        components: {
+            foo,
+            messageComp,
+            users,
+            simple
+        },
+        mixins: [helloMixin]
+    }
+</script>
+
+<style>
+    .red {
+        color: #f00;
+    }
+</style>
diff --git a/tests/renderer.js b/tests/renderer.js
index 2f8b7b9..eb4b78e 100644
--- a/tests/renderer.js
+++ b/tests/renderer.js
@@ -4,6 +4,7 @@ const path = require("path");
 const Pronto = require("../lib");
 
 const vueFile = path.join("index/index.vue");
+const vueFileWithProps = path.join("index/index-with-props.vue");
 const rootPath = path.normalize(path.join(__dirname, "../tests/example/views"));
 
 //@ts-ignore
@@ -106,6 +107,22 @@ test("String returns with no object", t => {
         });
 });
 
+
+//@ts-ignore
+test("String returns with propsData", t => {
+    // @ts-ignore
+    const renderer = new Pronto({ rootPath: rootPath });
+    const expected = `<!DOCTYPE html><html><head><script src="https://cdn.jsdelivr.net/npm/vue@latest/dist/vue.min.js" ></script><style>.red{color:red}.subcomponent[data-v-9f7c0fc6]{color:green}h2[data-v-9f7c0fc6]{font-size:40px}.test{color:pink;font-size:20px}.simple{color:#00f;text-decoration:underline}</style></head><body><div id="app"><div data-server-rendered="true"><h1 class="red">Hello world!</h1> <div><h2>Hello from component</h2> <button type="button" name="button">component</button> <h2 class="subcomponent" data-v-9f7c0fc6>Hello from subcomponent</h2></div> <p></p> <div></div> <h1></h1> <p>Welcome to the  demo. Click a link:</p> <p>import fooTransitionExpand from '@foo/styles-animation/src/components/foo-transition-expand.vue';</p> <p>const test = require(&quot;foo.vue&quot;);</p> <p>const bar = require(&quot;bar.vue&quot;);</p> <input placeholder="edit me" value="Say Foo"> <button type="button" name="button">Say Foo</button> <div><h1>Say Foo</h1></div> <div><ul></ul></div> <div><p class="simple">Hello From Component in node_modules</p></div></div></div><script>(function(){"use strict";var createApp = function () {return new Vue({"data":function data() { return {"msg":"Hello world!","messageOuter":"Say Foo"}; },"components":{"foo":{"props":{"hellodata":{"default":"default","type":String,"required":true}},"data":function data() { return {}; },"mixins":[{"methods":{"hello":function hello(str) {\n            console.log(str);\n        }}}],"components":{"subcomponent":{"props":{"subdata":{"default":"default","type":String,"required":true}},"data":function data() { return {}; },"render":function (){var _h=this.$createElement;return(this._self._c||_h)("h2",{staticClass:"subcomponent"},[this._v("Hello from "+this._s(this.subdata))])},"_scopeId":"data-v-9f7c0fc6"}},"render":function render() {var _vm=this,_h=_vm.$createElement,_c=_vm._self._c||_h;return _c("div",[_c("h2",[_vm._v("Hello from "+_vm._s(_vm.hellodata))]),_vm._v(" "),_c("button",{attrs:{type:"button",name:"button"},on:{click:function($event){_vm.hello(_vm.hellodata)}}},[_vm._v(_vm._s(_vm.hellodata))]),_vm._v(" "),_c("subcomponent",{attrs:{subdata:"subcomponent"}})],1)}},"messageComp":{"props":["message"],"render":function render() {var _h=this.$createElement,_c=this._self._c||_h;return _c("div",{},[_c("h1",[this._v(this._s(this.message))])])}},"users":{"props":["title","users"],"render":function render() {var _vm=this,_h=_vm.$createElement,_c=_vm._self._c||_h;return _c("div",{},[_c("ul",_vm._l(_vm.users,function(user){return _c("li",[_c("a",{staticClass:"test",attrs:{href:"/users/"+user.name}},[_vm._v(_vm._s(user.name))])])}))])}},"simple":{"data":function data() { return {"location":"node_modules"}; },"render":function render() {var _h=this.$createElement,_c=this._self._c||_h;return _c("div",[_c("p",{staticClass:"simple"},[this._v("Hello From Component in "+this._s(this.location))])])}}},"mixins":[{"methods":{"hello":function hello(str) {\n            console.log(str);\n        }}}],"render":function render() {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',[_c('h1',{staticClass:"red"},[_vm._v(_vm._s(_vm.msg))]),_vm._v(" "),_c('foo',{attrs:{"hellodata":"component"}}),_vm._v(" "),_c('p',[_vm._v(_vm._s(_vm.bar))]),_vm._v(" "),_c('div',{domProps:{"innerHTML":_vm._s(_vm.fakehtml)}}),_vm._v(" "),_c('h1',[_vm._v(_vm._s(_vm.title))]),_vm._v(" "),_c('p',[_vm._v("Welcome to the "+_vm._s(_vm.title)+" demo. Click a link:")]),_vm._v(" "),_c('p',[_vm._v("import fooTransitionExpand from '@foo/styles-animation/src/components/foo-transition-expand.vue';")]),_vm._v(" "),_c('p',[_vm._v("const test = require(\\"foo.vue\\");")]),_vm._v(" "),_c('p',[_vm._v("const bar = require(\\"bar.vue\\");")]),_vm._v(" "),_c('input',{directives:[{name:"model",rawName:"v-model",value:(_vm.messageOuter),expression:"messageOuter"}],attrs:{"placeholder":"edit me"},domProps:{"value":(_vm.messageOuter)},on:{"input":function($event){if($event.target.composing){ return; }_vm.messageOuter=$event.target.value}}}),_vm._v(" "),_c('button',{attrs:{"type":"button","name":"button"},on:{"click":function($event){_vm.hello(_vm.messageOuter)}}},[_vm._v(_vm._s(_vm.messageOuter))]),_vm._v(" "),_c('message-comp',{attrs:{"message":_vm.messageOuter}}),_vm._v(" "),_c('users',{attrs:{"users":_vm.users}}),_vm._v(" "),_c('simple')],1)},"staticRenderFns":[],"propsData":{}})};"undefined"!=typeof module&&module.exports?module.exports=createApp:this.app=createApp()}).call(this),app.$mount("#app");</script></body></html>`;
+    return renderer
+        .RenderToString(vueFileWithProps, {}, {propsData: {}})
+        .then(rendered => {
+            t.is(rendered.replace(/([\[|\s|\"])data-v-(.*)([\]|\>|\"])/gm, function(match, p1, p2, p3) { return p1 + 'data-v-123456' + p3; }), expected.replace(/([\[|\s|\"])data-v-(.*)([\]|\>|\"])/gm, function(match, p1, p2, p3) { return p1 + 'data-v-123456' + p3; }));
+        })
+        .catch(error => {
+            t.fail(error);
+        });
+});
+
 //@ts-ignore
 test.cb("Stream returns with full object", t => {
     // @ts-ignore
@@ -158,3 +175,36 @@ test.cb("Stream returns with no object", t => {
             t.fail(error);
         });
 });
+
+//@ts-ignore
+test.cb("Stream returns with full propsData", t => {
+    // @ts-ignore
+    const propsData = {
+        bar: true,
+        fakehtml: '<p class="red">FAKEHTML</p>'
+    };
+    const renderer = new Pronto({ rootPath: rootPath, propsData: propsData });
+
+    const templateLiteral = `<!DOCTYPE html>\n<html lang="en">\n<head>\n<title>{{title}}</title>\n<style>{{css}}</style>\n</head>\n<body>\n<h1>FOOOOO</h1>\n<!--vue-ssr-outlet-->\n</body>\n</html>`;
+
+    const vueOptions = {
+        head: {},
+        template: templateLiteral
+    };
+    const expected = `<!DOCTYPE html><html><head><script src="https://cdn.jsdelivr.net/npm/vue@latest/dist/vue.min.js" ></script><style>.red{color:red}.subcomponent[data-v-9f7c0fc6]{color:green}h2[data-v-9f7c0fc6]{font-size:40px}.test{color:pink;font-size:20px}.simple{color:#00f;text-decoration:underline}</style></head><body><div id="app"><div data-server-rendered="true"><h1 class="red">Hello world!</h1> <div><h2>Hello from component</h2> <button type="button" name="button">component</button> <h2 class="subcomponent" data-v-9f7c0fc6>Hello from subcomponent</h2></div> <p>true</p> <div><p class="red">FAKEHTML</p></div> <h1></h1> <p>Welcome to the  demo. Click a link:</p> <p>import fooTransitionExpand from '@foo/styles-animation/src/components/foo-transition-expand.vue';</p> <p>const test = require(&quot;foo.vue&quot;);</p> <p>const bar = require(&quot;bar.vue&quot;);</p> <input placeholder="edit me" value="Say Foo"> <button type="button" name="button">Say Foo</button> <div><h1>Say Foo</h1></div> <div><ul></ul></div> <div><p class="simple">Hello From Component in node_modules</p></div></div></div><script>(function(){"use strict";var createApp = function () {return new Vue({"data":function data() { return {"msg":"Hello world!","messageOuter":"Say Foo","bar":true,"fakehtml":"\\u003Cp class=\\"red\\"\\u003EFAKEHTML\\u003C\\u002Fp\\u003E"}; },"components":{"foo":{"props":{"hellodata":{"default":"default","type":String,"required":true}},"data":function data() { return {}; },"mixins":[{"methods":{"hello":function hello(str) {\n            console.log(str);\n        }}}],"components":{"subcomponent":{"props":{"subdata":{"default":"default","type":String,"required":true}},"data":function data() { return {}; },"render":function (){var _h=this.$createElement;return(this._self._c||_h)("h2",{staticClass:"subcomponent"},[this._v("Hello from "+this._s(this.subdata))])},"_scopeId":"data-v-9f7c0fc6"}},"render":function render() {var _vm=this,_h=_vm.$createElement,_c=_vm._self._c||_h;return _c("div",[_c("h2",[_vm._v("Hello from "+_vm._s(_vm.hellodata))]),_vm._v(" "),_c("button",{attrs:{type:"button",name:"button"},on:{click:function($event){_vm.hello(_vm.hellodata)}}},[_vm._v(_vm._s(_vm.hellodata))]),_vm._v(" "),_c("subcomponent",{attrs:{subdata:"subcomponent"}})],1)}},"messageComp":{"props":["message"],"render":function render() {var _h=this.$createElement,_c=this._self._c||_h;return _c("div",{},[_c("h1",[this._v(this._s(this.message))])])}},"users":{"props":["title","users"],"render":function render() {var _vm=this,_h=_vm.$createElement,_c=_vm._self._c||_h;return _c("div",{},[_c("ul",_vm._l(_vm.users,function(user){return _c("li",[_c("a",{staticClass:"test",attrs:{href:"/users/"+user.name}},[_vm._v(_vm._s(user.name))])])}))])}},"simple":{"data":function data() { return {"location":"node_modules"}; },"render":function render() {var _h=this.$createElement,_c=this._self._c||_h;return _c("div",[_c("p",{staticClass:"simple"},[this._v("Hello From Component in "+this._s(this.location))])])}}},"mixins":[{"methods":{"hello":function hello(str) {\n            console.log(str);\n        }}}],"render":function render() {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',[_c('h1',{staticClass:"red"},[_vm._v(_vm._s(_vm.msg))]),_vm._v(" "),_c('foo',{attrs:{"hellodata":"component"}}),_vm._v(" "),_c('p',[_vm._v(_vm._s(_vm.bar))]),_vm._v(" "),_c('div',{domProps:{"innerHTML":_vm._s(_vm.fakehtml)}}),_vm._v(" "),_c('h1',[_vm._v(_vm._s(_vm.title))]),_vm._v(" "),_c('p',[_vm._v("Welcome to the "+_vm._s(_vm.title)+" demo. Click a link:")]),_vm._v(" "),_c('p',[_vm._v("import fooTransitionExpand from '@foo/styles-animation/src/components/foo-transition-expand.vue';")]),_vm._v(" "),_c('p',[_vm._v("const test = require(\\"foo.vue\\");")]),_vm._v(" "),_c('p',[_vm._v("const bar = require(\\"bar.vue\\");")]),_vm._v(" "),_c('input',{directives:[{name:"model",rawName:"v-model",value:(_vm.messageOuter),expression:"messageOuter"}],attrs:{"placeholder":"edit me"},domProps:{"value":(_vm.messageOuter)},on:{"input":function($event){if($event.target.composing){ return; }_vm.messageOuter=$event.target.value}}}),_vm._v(" "),_c('button',{attrs:{"type":"button","name":"button"},on:{"click":function($event){_vm.hello(_vm.messageOuter)}}},[_vm._v(_vm._s(_vm.messageOuter))]),_vm._v(" "),_c('message-comp',{attrs:{"message":_vm.messageOuter}}),_vm._v(" "),_c('users',{attrs:{"users":_vm.users}}),_vm._v(" "),_c('simple')],1)},"staticRenderFns":[]})};"undefined"!=typeof module&&module.exports?module.exports=createApp:this.app=createApp()}).call(this),app.$mount("#app");</script></body></html>`;
+    // @ts-ignore
+    renderer
+        .RenderToStream(vueFileWithProps, {}, vueOptions)
+        .then(stream => {
+            let rendered = "";
+            stream.on("data", chunk => (rendered += chunk));
+            stream.on("end", () => {
+                t.is(rendered.replace(/([\[|\s|\"])data-v-(.*)([\]|\>|\"])/gm, function(match, p1, p2, p3) { return p1 + 'data-v-123456' + p3; }), expected.replace(/([\[|\s|\"])data-v-(.*)([\]|\>|\"])/gm, function(match, p1, p2, p3) { return p1 + 'data-v-123456' + p3; }));
+                t.end();
+            });
+        })
+        .catch(error => {
+            t.fail(error);
+        });
+});
+