diff --git a/LICENSE b/LICENSE
index 349b6f3..4f315c8 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 Invertase
+Copyright (c) 2015-2016 TeamFA
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in
diff --git a/README.md b/README.md
index 68c9592..5ec092b 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@ Angular Toasty
 
 #### Demo
 
-[Check it out!](https://invertase.github.io/angular-toasty/example/)
+[Check it out!](http://teamfa.com/angular-toasty/example/)
 
 #### Current Features
 * 3 Themes (Default, Material Design & Bootstrap 3)
@@ -175,4 +175,4 @@ $rootScope.$on('toasty-cleared', function(event, toast) { console.log(toast) });
 
 #### Contributing
 
-Please see the [contributing guidelines](https://github.com/invertase/angular-toasty/blob/master/CONTRIBUTING.md).
+Please see the [contributing guidelines](https://github.com/teamfa/angular-toasty/blob/master/CONTRIBUTING.md).
diff --git a/bower.json b/bower.json
index 164b968..31e868e 100644
--- a/bower.json
+++ b/bower.json
@@ -18,10 +18,10 @@
     "dependencies": {
         "angular": "~1.4.3"
     },
-    "homepage": "https://github.com/invertase/angular-toasty",
+    "homepage": "https://github.com/teamfa/angular-toasty",
     "repository": {
   		"type": "git",
-  		"url": "git://github.com/invertase/angular-toasty.git"
+  		"url": "git://github.com/teamfa/angular-toasty.git"
 	},
 	"license": "MIT"
 }
diff --git a/example/index.html b/example/index.html
index 3cce204..0f5ec5c 100644
--- a/example/index.html
+++ b/example/index.html
@@ -53,9 +53,9 @@
 		<header>
 			<div class="container">
 				<ul class="navbar-list">
-					<li class="navbar-item u-pull-left"><a class="navbar-link" href="http://invertase.github.io/angular-toasty/example/">angular-toasty</a></li>
-					<li class="navbar-item u-pull-right"><a class="navbar-link" href="https://github.com/invertase/angular-toasty">github</a></li>
-					<li class="navbar-item u-pull-right"><a class="navbar-link" href="https://invertase.io">invertase</a></li>
+					<li class="navbar-item u-pull-left"><a class="navbar-link" href="http://teamfa.github.io/angular-toasty/example/">angular-toasty</a></li>
+					<li class="navbar-item u-pull-right"><a class="navbar-link" href="https://github.com/teamfa/angular-toasty">github</a></li>
+					<li class="navbar-item u-pull-right"><a class="navbar-link" href="http://teamfa.com">teamfa</a></li>
 				</ul>
 			</div>
 		</header>
@@ -115,8 +115,8 @@
 				<button class="button-primary" style="width: 100px;" ng-click="newToast()" ng-bind="button"></button>
 				<div class="u-cf"></div>
 				<hr />
-				<iframe src="https://ghbtns.com/github-btn.html?user=invertase&repo=angular-toasty&type=star&count=true" frameborder="0" scrolling="0" width="100px" height="20px"></iframe>
-				<iframe src="https://ghbtns.com/github-btn.html?user=invertase&repo=angular-toasty&type=fork&count=true" frameborder="0" scrolling="0" width="100px" height="20px"></iframe>
+				<iframe src="https://ghbtns.com/github-btn.html?user=teamfa&repo=angular-toasty&type=star&count=true" frameborder="0" scrolling="0" width="100px" height="20px"></iframe>
+				<iframe src="https://ghbtns.com/github-btn.html?user=teamfa&repo=angular-toasty&type=fork&count=true" frameborder="0" scrolling="0" width="100px" height="20px"></iframe>
 			</div>
 		</div>
 
diff --git a/src/js/directive.js b/src/js/directive.js
index e1207bf..eaaab5d 100644
--- a/src/js/directive.js
+++ b/src/js/directive.js
@@ -129,8 +129,10 @@ angular.module('angular-toasty').directive('toasty', ['toasty', '$timeout', '$sc
 					onClick: options.onClick && angular.isFunction(options.onClick) ? options.onClick : null
 				};
 
-				// Push up a new toast item
-				scope.toasty.push(toast);
+				$timeout(function () {
+					// Push up a new toast item
+					scope.toasty.push(toast);
+				});
 
 				// If we have a onAdd function, call it here
 				if (options.onAdd && angular.isFunction(options.onAdd))