diff --git a/.gitignore b/.gitignore
index 8ee8c35..32b781d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,6 @@
 bower_components
 .atomignore
 .idea
-node_modules
\ No newline at end of file
+node_modules
+.c9
+.git
\ No newline at end of file
diff --git a/bower.json b/bower.json
index cf57510..042de6c 100644
--- a/bower.json
+++ b/bower.json
@@ -26,7 +26,8 @@
   ],
   "main": [
     "src/scripts/index.js",
-    "src/css/style.css"
+    "src/css/style.css",
+    "src/scripts/templates.js"
   ],
   "dependencies": {
     "angular": "~1.3.x",
diff --git a/package.json b/package.json
index 2889f59..6916e9d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-bootstrap-simple-chat",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "Simple Chat Directive for AngularJS with Bootstrap with infinite scroll",
   "main": "gulpfile.js",
   "dependencies": {
@@ -15,8 +15,8 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/irontec/angular-bootstrap-simple-chat"
+    "url": "https://github.com/smirciat/angular-bootstrap-simple-chat"
   },
   "license": "MIT",
-  "homepage": "https://github.com/irontec/angular-bootstrap-simple-chat"
+  "homepage": "https://github.com/smirciat/angular-bootstrap-simple-chat"
 }
diff --git a/src/scripts/index.js b/src/scripts/index.js
index 0b9895c..f2a1e7f 100644
--- a/src/scripts/index.js
+++ b/src/scripts/index.js
@@ -96,6 +96,9 @@
 			}, 250);
 		});
 		$scope.$watch('messages.length', function() {
+			//seems unnecessary, but it solved my problem.  Link between this.messages and $scope.messages was lost after initialization
+			vm.messages = $scope.messages;
+			
 			if (!$scope.historyLoading) scrollToBottom(); // don't scrollToBottom if just loading history
             if ($scope.expandOnNew && vm.isHidden) {
                 toggle();
diff --git a/src/scripts/templates.js b/src/scripts/templates.js
index b423567..82c0568 100644
--- a/src/scripts/templates.js
+++ b/src/scripts/templates.js
@@ -1 +1 @@
-angular.module("irontec.simpleChat").run(["$templateCache", function($templateCache) {$templateCache.put("chatTemplate.html","<div ng-show=\"visible\" class=\"row chat-window col-xs-5 col-md-3 {{vm.theme}}\" ng-class=\"{minimized: vm.isHidden}\">\r\n    <div class=\"col-xs-12 col-md-12\">\r\n        <div class=\"panel\">\r\n            <div class=\"panel-heading chat-top-bar\">\r\n                <div class=\"col-md-8 col-xs-8\">\r\n                    <h3 class=\"panel-title\"><span class=\"fa fa-comment-o\"></span> {{vm.title}}</h3>\r\n                </div>\r\n                <div class=\"col-md-4 col-xs-4 window-actions\" style=\"text-align: right;\">\r\n                    <span class=\"fa\" ng-class=\"vm.chatButtonClass\" ng-click=\"vm.toggle()\"></span>\r\n                    <span class=\"fa fa-close\" ng-click=\"vm.close()\"></span>\r\n                </div>\r\n            </div>\r\n            <div class=\"panel-body msg-container-base\" ng-style=\"vm.panelStyle\">\r\n                <div class=\"row msg-container\" ng-repeat=\"message in vm.messages\" ng-init=\"selfAuthored = vm.myUserId == message.fromUserId\">\r\n                    <div class=\"col-md-12 col-xs-12\">\r\n                        <div class=\"chat-msg\" ng-class=\"{\'chat-msg-sent\': selfAuthored, \'chat-msg-recieved\': !selfAuthored}\">\r\n                            <span class=\"hide\">myUserId:{{vm.myUserId}}</span>\r\n                            <img ng-if=\"message.imageUrl\" class=\"profile\" ng-class=\"{\'pull-right\': selfAuthored, \'pull-left\': !selfAuthored}\" ng-src=\"{{message.imageUrl}}\" />\r\n                            <p>{{message.content}}</p>\r\n                            <div class=\"chat-msg-author\">\r\n                                <strong>{{message.username}}</strong>&nbsp;\r\n                                <span class=\"date\">{{message.date|date:hh:mm:a}}</span>\r\n                            </div>\r\n                        </div>\r\n                    </div>\r\n                </div>\r\n            </div>\r\n            <div class=\"panel-footer chat-bottom-bar\">\r\n                <form style=\"display:inherit\" ng-submit=\"vm.submitFunction()\">\r\n                    <div class=\"input-group\" >\r\n                        <input type=\"text\" class=\"form-control input-sm chat-input\" placeholder=\"{{vm.inputPlaceholderText}}\" ng-model=\"vm.writingMessage\" />\r\n                        <span class=\"input-group-btn\">\r\n                            <input type=\"submit\" class=\"btn btn-sm chat-submit-button\" value=\"{{vm.submitButtonText}}\" />\r\n                        </span>\r\n                    </div>\r\n                </form>\r\n            </div>\r\n        </div>\r\n    </div>\r\n</div>");}]);
\ No newline at end of file
+angular.module("irontec.simpleChat").run(["$templateCache", function($templateCache) {$templateCache.put("chatTemplate.html","<div ng-show=\"visible\" class=\"row chat-window col-xs-12 col-md-12 {{vm.theme}}\" ng-class=\"{minimized: vm.isHidden}\">\r\n    <div class=\"col-xs-12 col-md-12\">\r\n        <div class=\"panel\">\r\n            <div class=\"panel-heading chat-top-bar\">\r\n                <div class=\"col-md-8 col-xs-8\">\r\n                    <h3 class=\"panel-title\"><span class=\"fa fa-comment-o\"></span> {{vm.title}}</h3>\r\n                </div>\r\n                <div class=\"col-md-4 col-xs-4 window-actions\" style=\"text-align: right;\">\r\n                    <span class=\"fa\" ng-class=\"vm.chatButtonClass\" ng-click=\"vm.toggle()\"></span>\r\n                    <span class=\"fa fa-close\" ng-click=\"vm.close()\"></span>\r\n                </div>\r\n            </div>\r\n            <div class=\"panel-body msg-container-base\" ng-style=\"vm.panelStyle\">\r\n                <div class=\"row msg-container\" ng-repeat=\"message in vm.messages\" ng-init=\"selfAuthored = vm.myUserId == message.fromUserId\">\r\n                    <div class=\"col-md-12 col-xs-12\">\r\n                        <div class=\"chat-msg\" ng-class=\"{\'chat-msg-sent\': selfAuthored, \'chat-msg-recieved\': !selfAuthored}\">\r\n                            <span class=\"hide\">myUserId:{{vm.myUserId}}</span>\r\n                            <img ng-if=\"message.imageUrl\" class=\"profile\" ng-class=\"{\'pull-right\': selfAuthored, \'pull-left\': !selfAuthored}\" ng-src=\"{{message.imageUrl}}\" />\r\n                            <p>{{message.content}}</p>\r\n                            <div class=\"chat-msg-author\">\r\n                                <strong>{{message.username}}</strong>&nbsp;\r\n                                <span class=\"date\">{{message.date|date:hh:mm:a}}</span>\r\n                            </div>\r\n                        </div>\r\n                    </div>\r\n                </div>\r\n            </div>\r\n            <div class=\"panel-footer chat-bottom-bar\">\r\n                <form style=\"display:inherit\" ng-submit=\"vm.submitFunction()\">\r\n                    <div class=\"input-group\" >\r\n                        <input type=\"text\" class=\"form-control input-sm chat-input\" placeholder=\"{{vm.inputPlaceholderText}}\" ng-model=\"vm.writingMessage\" />\r\n                        <span class=\"input-group-btn\">\r\n                            <input type=\"submit\" class=\"btn btn-sm chat-submit-button\" value=\"{{vm.submitButtonText}}\" />\r\n                        </span>\r\n                    </div>\r\n                </form>\r\n            </div>\r\n        </div>\r\n    </div>\r\n</div>");}]);
\ No newline at end of file