diff --git a/readme.md b/readme.md
index 089959f..b5b7232 100644
--- a/readme.md
+++ b/readme.md
@@ -1,6 +1,6 @@
 # Page Number ExpressionEngine Plugin
 
-An ExpressionEngine plugin to determine the page number of paginated entries for ExpressionEngine 2.
+An ExpressionEngine plugin to determine the page number of paginated entries for ExpressionEngine 2+.
 
 Usage example:
 		
diff --git a/system/expressionengine/third_party/page_number/addon.setup.php b/system/expressionengine/third_party/page_number/addon.setup.php
new file mode 100644
index 0000000..a23c6ba
--- /dev/null
+++ b/system/expressionengine/third_party/page_number/addon.setup.php
@@ -0,0 +1,10 @@
+<?php
+
+return array(
+  'author'      => 'John Faulds',
+  'author_url'  => 'http://www.tyssendesign.com.au',
+  'name'        => 'Page Number of Paginated Entrie',
+  'description' => 'Determine the page number of paginated entries for ExpressionEngine2',
+  'version'     => '1.0.1',
+  'namespace'   => 'JohnFaulds\PageNumber'
+);
diff --git a/system/expressionengine/third_party/page_number/pi.page_number.php b/system/expressionengine/third_party/page_number/pi.page_number.php
index c0763fc..fcc8122 100755
--- a/system/expressionengine/third_party/page_number/pi.page_number.php
+++ b/system/expressionengine/third_party/page_number/pi.page_number.php
@@ -11,50 +11,49 @@
 =====================================================
 */
 
+$setup = require_once('addon.setup.php');
 $plugin_info = array(
-	'pi_name'			=> 'Page Number of Paginated Entries',
-	'pi_version'		=> '1.0.0',
-	'pi_author'			=> 'John Faulds',
-	'pi_author_url'		=> 'http://www.tyssendesign.com.au',
-	'pi_description'	=> 'Determine the page number of paginated entries for ExpressionEngine2',
-	'pi_usage'			=> Page_number::usage()
-);
+   'pi_name'        => $setup['name'],
+   'pi_version'     => $setup['version'],
+   'pi_author'      => $setup['author'],
+   'pi_author_url'  => $setup['author_url'],
+   'pi_description' => $setup['description'],
+   'pi_usage'       => Page_number::usage()
+   );
 
 
 class Page_number {
 
 	var $return_data="";
 
-	
-	function Page_number()
-	{    
-		
-		$this->EE =& get_instance();
-		
-		$url_segment = $this->EE->TMPL->fetch_param('url_segment');
-		$limit = $this->EE->TMPL->fetch_param('limit');
-	
+	public function __construct()
+	{
+
+		$url_segment = ee()->TMPL->fetch_param('url_segment');
+		$limit = ee()->TMPL->fetch_param('limit');
+
 		$segment_number = str_replace("P", "", $url_segment);
 		$result = ($segment_number / $limit) + 1;
-		
+
 		return $this->return_data = $result;
+    
 	}
 
-    
+
 	// ----------------------------------------
-	//  Plugin Usage 
+	//  Plugin Usage
 	// ----------------------------------------
 
 	// This function describes how the plugin is used.
 	//  Make sure and use output buffering
 
 	public static function usage()
-	{	
-	ob_start(); 
+	{
+	ob_start();
 	?>
 
 	Usage example:
-		
+
 	Place {exp:page_number url_segment="{segment_1}" limit="5" parse="inward"} somewhere in your template.
 
 	Parameters:
@@ -64,8 +63,8 @@ public static function usage()
 
 	<?php
 	$buffer = ob_get_contents();
-		
-	ob_end_clean(); 
+
+	ob_end_clean();
 
 	return $buffer;
 	}