diff --git a/application/config/config.php b/application/config/config.php
index 969fe7128..e323183e7 100644
--- a/application/config/config.php
+++ b/application/config/config.php
@@ -9,7 +9,7 @@
 |
 |
 */
-$config['application_version'] = '2.0_RC8';
+$config['application_version'] = '2.0';
 
 /*
 |--------------------------------------------------------------------------
diff --git a/application/hooks/load_config.php b/application/hooks/load_config.php
index a19115981..33ccfbb77 100644
--- a/application/hooks/load_config.php
+++ b/application/hooks/load_config.php
@@ -10,7 +10,14 @@ function load_config()
 	
 	if ($CI->config->item('language'))
 	{
-		//$CI->lang->switch_to($CI->config->item('language'));
+		$CI->config->set_item( 'language', $CI->config->item( 'language' ) );
+    $loaded = $CI->lang->is_loaded;
+    $CI->lang->is_loaded = array();
+
+    foreach($loaded as $file)
+    {
+        $CI->lang->load( str_replace( '_lang.php', '', $file ) );    
+    }
 	}
 	
 	if ($CI->config->item('timezone'))
diff --git a/application/libraries/MY_Language.php b/application/libraries/MY_Language.php
deleted file mode 100644
index 226fbb9af..000000000
--- a/application/libraries/MY_Language.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-class MY_Language extends CI_Language
-{
-    function MY_Language()
-    {
-        parent::CI_Language();
-    }
-    
-    function switch_to($idiom)
-    {
-        $CI =& get_instance();
-        if(is_string($idiom))
-        {
-            $CI->config->set_item('language',$idiom);
-            $loaded = $this->is_loaded;
-            $this->is_loaded = array();
-                
-            foreach($loaded as $file)
-            {
-                $this->load(str_replace('_lang.php','',$file));    
-            }
-        }
-    }
-}
-
-?>