diff --git a/app/filters.php b/app/filters.php
index 5629d456..b51823e1 100644
--- a/app/filters.php
+++ b/app/filters.php
@@ -1,6 +1,7 @@
 <?php
 
 	Route::filter('no_setup', 'NoSetupFilter');
+	Route::filter('cors', 'CORSFilter');
 
 	/*
 	|--------------------------------------------------------------------------
@@ -13,24 +14,18 @@
 	|
 	*/
 
-	Route::filter('auth', function()
-	{
-		if (Auth::guest())
-		{
-			if (Request::ajax())
-			{
+	Route::filter('auth', function() {
+		if (Auth::guest()) {
+			if (Request::ajax()) {
 				return Response::make('Unauthorized', 401);
-			}
-			else
-			{
+			} else {
 				return Redirect::guest('auth/login');
 			}
 		}
 	});
 
 
-	Route::filter('auth.basic', function()
-	{
+	Route::filter('auth.basic', function() {
 		return Auth::basic();
 	});
 
@@ -45,9 +40,10 @@
 	|
 	*/
 
-	Route::filter('guest', function()
-	{
-		if (Auth::check()) return Redirect::to('/');
+	Route::filter('guest', function() {
+		if (Auth::check()) {
+			return Redirect::to('/');
+		}
 	});
 
 	/*
@@ -61,10 +57,8 @@
 	|
 	*/
 
-	Route::filter('csrf', function()
-	{
-		if (Session::token() !== Input::get('_token'))
-		{
+	Route::filter('csrf', function() {
+		if (Session::token() !== Input::get('_token')) {
 			throw new Illuminate\Session\TokenMismatchException;
 		}
 	});
diff --git a/app/filters/CORSFilter.php b/app/filters/CORSFilter.php
new file mode 100644
index 00000000..000c87fa
--- /dev/null
+++ b/app/filters/CORSFilter.php
@@ -0,0 +1,8 @@
+<?php
+
+	class CORSFilter {
+		public function filter($route, $request, $response) {
+			$response->headers->set('Access-Control-Allow-Origin', '*');
+			return $response;
+		}
+	}