diff --git a/purger.php b/purger.php
index abf22190..41dc3375 100644
--- a/purger.php
+++ b/purger.php
@@ -102,10 +102,7 @@ function purgePost( $_ID ) {
 			$this->log( "Function purgePost BEGIN ===" );
 
 			if ( $rt_wp_nginx_helper->options[ 'purge_homepage_on_edit' ] == 1 ) {
-				$homepage_url = trailingslashit( home_url() );
-
-				$this->log( "Purging homepage '$homepage_url'" );
-				$this->purgeUrl( $homepage_url );
+				$this->_purge_homepage(); 
 			}
 
 
@@ -435,10 +432,18 @@ function purge_on_post_moved_to_trash( $new_status, $old_status, $post ) {
 		}
 
 		private function _purge_homepage() {
+		    //  WPML installetd?
+			if ( function_exists('icl_get_home_url') )
+			{
+				$homepage_url = trailingslashit( icl_get_home_url() );
+				$this->log( sprintf( __( "Purging homepage (WPML) '%s'", "nginx-helper" ), $homepage_url ) );
+			}
+			else
+			{
+				$homepage_url = trailingslashit( home_url() );
+				$this->log( sprintf( __( "Purging homepage '%s'", "nginx-helper" ), $homepage_url ) );
+			}
 
-			$homepage_url = trailingslashit( home_url() );
-
-			$this->log( sprintf( __( "Purging homepage '%s'", "nginx-helper" ), $homepage_url ) );
 			$this->purgeUrl( $homepage_url );
 
 			return true;
diff --git a/redis-purger.php b/redis-purger.php
index 3073a6d4..3fbe948a 100644
--- a/redis-purger.php
+++ b/redis-purger.php
@@ -109,10 +109,8 @@ function purgePost( $_ID )
 			$this->log( "Function purgePost BEGIN ===" );
 
 			if ( $rt_wp_nginx_helper->options['purge_homepage_on_edit'] == 1 ) {
-				$homepage_url = trailingslashit( home_url() );
-
 				$this->log( "Purging homepage '$homepage_url'" );
-				$this->purgeUrl( $homepage_url );
+				$this->_purge_homepage();
 			}
 
 
@@ -329,10 +327,18 @@ function purge_on_post_moved_to_trash( $new_status, $old_status, $post )
 
 		private function _purge_homepage()
 		{
+			//  WPML installetd?
+			if ( function_exists('icl_get_home_url') )
+			{
+				$homepage_url = trailingslashit( icl_get_home_url() );
+				$this->log( sprintf( __( "Purging homepage (WPML) '%s'", "nginx-helper" ), $homepage_url ) );
+			}
+			else
+			{
+				$homepage_url = trailingslashit( home_url() );
+				$this->log( sprintf( __( "Purging homepage '%s'", "nginx-helper" ), $homepage_url ) );
+			}
 
-			$homepage_url = trailingslashit( home_url() );
-
-			$this->log( sprintf( __( "Purging homepage '%s'", "nginx-helper" ), $homepage_url ) );
 			$this->purgeUrl( $homepage_url );
 
 			return true;
@@ -661,11 +667,12 @@ function purge_on_check_ajax_referer( $action, $result )
 		function true_purge_all()
 		{
 			global $rt_wp_nginx_helper;
+			$prefix = substr($rt_wp_nginx_helper->options['redis_prefix'],0, -1);
 			$this->log( "* * * * *" );
 			$this->log( "* Purged Everything!" );
 			$this->log( "* * * * *" );
 			//delete_multi_keys("*");
-			delete_keys_by_wildcard("*");
+			delete_keys_by_wildcard($prefix."*");
 		}
 		
 		function purge_urls()