diff --git a/COPYRIGHT.txt b/COPYRIGHT.txt
index e0ceea9..d986301 100644
--- a/COPYRIGHT.txt
+++ b/COPYRIGHT.txt
@@ -1,7 +1,7 @@
 Redmine Google Analytics is a Redmine plugin to insert the Google Analytics
 tracking code into Redmine based on user roles.
 
-Copyright (C) 2008 Eric Davis, Little Stream Software
+Copyright (C) 2008-2012 Eric Davis, Little Stream Software
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
diff --git a/CREDITS.txt b/CREDITS.txt
index ba5e5b9..9082a18 100644
--- a/CREDITS.txt
+++ b/CREDITS.txt
@@ -1,9 +1,11 @@
 Thanks go to the following people for patches and contributions:
 
-Maintainers
-
-* Eric Davis of Little Stream Software
-
 Contributors
 
+* Eric Davis of Little Stream Software
 * Gergő Jónás
+* rkallensee https://github.com/rkallensee/redmine-google-analytics-plugin
+* Makoto Kawasaki http://makotokw.com
+* Tobias Fischer (pagina GmbH): https://github.com/paginagmbh
+* Marcelo Romulo Fernandes
+* Michael Pirogov
\ No newline at end of file
diff --git a/README.rdoc b/README.rdoc
index 297c3a4..6550353 100644
--- a/README.rdoc
+++ b/README.rdoc
@@ -1,31 +1,31 @@
 = Redmine Google Analytics Plugins
 
-Redmine plugin to insert the Google Analytics tracking code into Redmine based on user roles.
+Redmine plugin to insert a Google Analytics (or e.g. Piwik) tracking code into Redmine based on user roles.
+
 
 == Features
 
-Adds your Google Analytics code to every pageview depending on your User roles; Anonymous user, Authenticated User, and Administrator.
+Adds your Google Analytics (or e.g. Piwik) code to every pageview depending on your User roles; Anonymous user, Authenticated User, and/or Administrator.
 
-== Installation and Setup
 
-1. Download the plugin.  There are three supported ways:
-   *  Downloading the latest archive file from Little Stream Software projects (https://projects.littlestreamsoftware.com)
-   * Checkout the source from Git
+== Installation and Setup
 
-       git clone git://github.com/edavis10/redmine-google-analytics-plugin.git vendor/plugins/google_analytics_plugin
+This plugin version requires Redmine >= 2.0.0!
 
-   * Install it using Rail's plugin installer
+1. Change in the plugin directory of your redmine installation
+       cd /your_redmine_root/plugins/
+2. Download the plugin. There are two supported ways:
+   * Downloading the latest archive file from the GitHub project page:
+       wget https://github.com/paginagmbh/redmine-google-analytics-plugin/archive/master.zip
+   * Checkout the sources from Git:
+       git clone git://github.com/paginagmbh/redmine-google-analytics-plugin.git plugins/google_analytics_plugin
+3. Restart your redmine webserver
+4. Login to your Redmine install as an Administrator.
+5. Configure your settings in _Administration_ > _Plugins_ > [Google Analytics plugin] - _Configure_
 
-       script/plugin install git://github.com/edavis10/redmine-google-analytics-plugin.git
+You have to paste the complete Google Analytics or e.g. Piwik tracking code, including the HTML script tags, into the field.
 
-2. Login to your Redmine install as an Administrator.
-3. Configure your settings in Administration > Information > Configure
 
 == License
 
-This plugin is licensed under the GNU GPL v2.  See COPYRIGHT.txt and GPL.txt for details.
-
-== Project help
-
-If you need help you can contact the maintainer at the Bug Tracker.  The bug tracker is located at  https://projects.littlestreamsoftware.com
-
+This plugin is licensed under the GNU GPL v2. See COPYRIGHT.txt and GPL.txt for details.
diff --git a/Rakefile b/Rakefile
index 5e9a2ce..be42e99 100755
--- a/Rakefile
+++ b/Rakefile
@@ -12,17 +12,16 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |s|
     s.name = "google_analytics_plugin"
-    s.summary = "Redmine plugin to insert the Google Analytics tracking code into Redmine based on user roles."
+    s.summary = "Redmine plugin to insert a Google Analytics (or e.g. Piwik) tracking code into Redmine based on user roles."
     s.email = "edavis@littlestreamsoftware.com"
     s.homepage = "https://projects.littlestreamsoftware.com/projects/TODO"
-    s.description = "Redmine plugin to insert the Google Analytics tracking code into Redmine based on user roles."
+    s.description = "Redmine plugin to insert a Google Analytics (or e.g. Piwik) tracking code into Redmine based on user roles."
     s.authors = ["Eric Davis"]
     s.rubyforge_project = "google_analytics_plugin" # TODO
     s.files =  FileList[
                         "[A-Z]*",
                         "init.rb",
-                        "rails/init.rb",
-                        "{bin,generators,lib,test,app,assets,config,lang}/**/*",
+                        "{bin,generators,lib,test,app,assets,config}/**/*",
                         'lib/jeweler/templates/.gitignore'
                        ]
   end
diff --git a/VERSION b/VERSION
index 0ea3a94..f2b3082 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.2.0
+0.3.0-beta
diff --git a/app/views/settings/_google_analytics_settings.rhtml b/app/views/settings/_google_analytics_settings.html.erb
similarity index 94%
rename from app/views/settings/_google_analytics_settings.rhtml
rename to app/views/settings/_google_analytics_settings.html.erb
index 56234df..6f7008c 100644
--- a/app/views/settings/_google_analytics_settings.rhtml
+++ b/app/views/settings/_google_analytics_settings.html.erb
@@ -1,5 +1,5 @@
 <p>
-  <%= l(:google_analytics_directions) %>
+  <%= raw l(:google_analytics_directions) %>
 </p>
 
 <p>
diff --git a/config/locales/de.yml b/config/locales/de.yml
new file mode 100644
index 0000000..99800bc
--- /dev/null
+++ b/config/locales/de.yml
@@ -0,0 +1,6 @@
+de:
+  google_analytics_directions: Bitte den <a href="http://www.google.com/analytics/">Google Analytics</a>-JavaScript-Code in das Textfeld einfügen und die gewünschten Tracking-Optionen auswählen.
+  google_analytics_code_label: Google Analytics-Code (inklusive <script>-Tags)
+  google_analytics_log_anonymous_label: Anonyme Benutzer tracken
+  google_analytics_log_authenticated_label: Authentifizierte Benutzer tracken
+  google_analytics_log_administrator_label: Administratoren tracken
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
new file mode 100644
index 0000000..2d1237c
--- /dev/null
+++ b/config/locales/ja.yml
@@ -0,0 +1,6 @@
+ja:
+  google_analytics_directions: <a href="http://www.google.com/analytics/">Google Analytics</a> トラッキングコードを以下に設定してください。
+  google_analytics_code_label: トラッキングコード (scriptタグを含む)
+  google_analytics_log_anonymous_label: 匿名ユーザのトラッキング
+  google_analytics_log_authenticated_label: ログインユーザのトラッキング
+  google_analytics_log_administrator_label: 管理者ユーザのトラッキング
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
new file mode 100644
index 0000000..3d4f330
--- /dev/null
+++ b/config/locales/pt-BR.yml
@@ -0,0 +1,6 @@
+pt-BR:
+  google_analytics_directions: Insira seu código JavaScript <a href="http://www.google.com/analytics/">Google Analytics</a> na área abaixo e escolha suas opções de log.
+  google_analytics_code_label: Código Google Analytics (incluindo script tags)
+  google_analytics_log_anonymous_label: Logar usuário anônimo
+  google_analytics_log_authenticated_label: Logar usuário autenticado
+  google_analytics_log_administrator_label: Logar usuário administrador
diff --git a/config/locales/pt.yml b/config/locales/pt.yml
new file mode 100644
index 0000000..8c3fbd8
--- /dev/null
+++ b/config/locales/pt.yml
@@ -0,0 +1,6 @@
+pt:
+  google_analytics_directions: Insira seu código JavaScript <a href="http://www.google.com/analytics/">Google Analytics</a> na área abaixo e escolha suas opções de log.
+  google_analytics_code_label: Código Google Analytics (incluindo script tags)
+  google_analytics_log_anonymous_label: Logar usuário anônimo
+  google_analytics_log_authenticated_label: Logar usuário autenticado
+  google_analytics_log_administrator_label: Logar usuário administrador
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
new file mode 100644
index 0000000..58b6c76
--- /dev/null
+++ b/config/locales/ru.yml
@@ -0,0 +1,6 @@
+ru:
+  google_analytics_directions: Введите ваш JavaScript код от <a href="http://www.google.com/analytics/">Google Analytics</a> в поле ниже и выберите параметры отслеживания.
+  google_analytics_code_label: Код Google Analytics (включая теги SCRIPT)
+  google_analytics_log_anonymous_label: Отслеживать анонимных пользователей
+  google_analytics_log_authenticated_label: Отслеживать авторизованных пользователей
+  google_analytics_log_administrator_label: Отслеживать администраторов.
diff --git a/google_analytics_plugin.gemspec b/google_analytics_plugin.gemspec
index be3eed4..9379934 100644
--- a/google_analytics_plugin.gemspec
+++ b/google_analytics_plugin.gemspec
@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{google_analytics_plugin}
-  s.version = "0.2.0"
+  s.version = "0.3.0-beta"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Eric Davis"]
-  s.date = %q{2009-10-14}
-  s.description = %q{Redmine plugin to insert the Google Analytics tracking code into Redmine based on user roles.}
+  s.date = %q{2012-09-02}
+  s.description = %q{Redmine plugin to insert a Google Analytics (or e.g. Piwik) tracking code into Redmine based on user roles.}
   s.email = %q{edavis@littlestreamsoftware.com}
   s.extra_rdoc_files = [
     "README.rdoc"
@@ -22,16 +22,17 @@ Gem::Specification.new do |s|
      "README.rdoc",
      "Rakefile",
      "VERSION",
-     "app/views/settings/_google_analytics_settings.rhtml",
+     "app/views/settings/_google_analytics_settings.html.erb",
+     "config/locales/de.yml",
      "config/locales/en.yml",
      "config/locales/hu.yml",
      "config/locales/it.yml",
+     "config/locales/ja.yml",
+     "config/locales/pt.yml",
+     "config/locales/pt-BR.yml",
+     "config/locales/ru.yml",
      "init.rb",
-     "lang/en.yml",
-     "lang/hu.yml",
-     "lang/it.yml",
      "lib/google_analytics_hooks.rb",
-     "rails/init.rb",
      "test/test_helper.rb"
   ]
   s.homepage = %q{https://projects.littlestreamsoftware.com/projects/TODO}
@@ -39,7 +40,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{google_analytics_plugin}
   s.rubygems_version = %q{1.3.5}
-  s.summary = %q{Redmine plugin to insert the Google Analytics tracking code into Redmine based on user roles.}
+  s.summary = %q{Redmine plugin to insert a Google Analytics (or e.g. Piwik) tracking code into Redmine based on user roles.}
   s.test_files = [
     "test/test_helper.rb"
   ]
diff --git a/init.rb b/init.rb
index 7c16c46..ba7d41f 100644
--- a/init.rb
+++ b/init.rb
@@ -1 +1,22 @@
-require File.dirname(__FILE__) + "/rails/init"
+require 'redmine'
+
+require_dependency 'google_analytics_hooks'
+
+Redmine::Plugin.register :google_analytics_plugin do
+  name 'Google Analytics plugin'
+  author 'Eric Davis & Raphael Kallensee'
+  description 'Redmine plugin to insert a Google Analytics (or e.g. Piwik) tracking code into Redmine based on user roles.'
+  url 'https://github.com/rkallensee/redmine-google-analytics-plugin'
+  version '0.4.0'
+
+  requires_redmine :version_or_higher => '2.0.0'
+
+  settings :default => {
+    'google_analytics_code' => '',
+    'google_analytics_log_anonymous' => true,
+    'google_analytics_log_authenticated' => true,
+    'google_analytics_log_administrator' => true
+  }, :partial => 'google_analytics_settings'
+
+end
+
diff --git a/lang/en.yml b/lang/en.yml
deleted file mode 100644
index 41528aa..0000000
--- a/lang/en.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-# English strings go here
-google_analytics_directions: Enter your <a href="http://www.google.com/analytics/">Google Analytics</a> JavaScript code into the area below and choose your logging options.
-google_analytics_code_label: Google Analytics code (including script tags)
-google_analytics_log_anonymous_label: Log anonymous users
-google_analytics_log_authenticated_label: Log authenticated user
-google_analytics_log_administrator_label: Log administrator users
diff --git a/lang/hu.yml b/lang/hu.yml
deleted file mode 100644
index 2583ea0..0000000
--- a/lang/hu.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-google_analytics_directions: 'Add meg a te <a href="http://www.google.com/analytics/">Google Analytics</a> JavaScript kódodat a lenti mezőben és válaszd ki a naplózási beállításokat.'
-google_analytics_code_label: Google Analytics kód (script címkékkel együtt)
-google_analytics_log_anonymous_label: Anoním felhasználók naplója
-google_analytics_log_authenticated_label: Azonosított felhasználók naplója
-google_analytics_log_administrator_label: Adminisztrátor felhasználók naplója
diff --git a/lang/it.yml b/lang/it.yml
deleted file mode 100644
index e7213b1..0000000
--- a/lang/it.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-google_analytics_directions: Scrivi il codice JavaScript di Google Analytics nel campo qui sotto e scegli le opzioni di logging.
-google_analytics_code_label: Codice Google Analytics (incluso il tag script)
-google_analytics_log_anonymous_label: Traccia utenti anonimi
-google_analytics_log_authenticated_label: Traccia utenti autenticati
-google_analytics_log_administrator_label: Traccia amministratori
diff --git a/lib/google_analytics_hooks.rb b/lib/google_analytics_hooks.rb
index fd6f37f..829da1b 100644
--- a/lib/google_analytics_hooks.rb
+++ b/lib/google_analytics_hooks.rb
@@ -1,6 +1,6 @@
 # This class hooks into Redmine's View Listeners in order to
 # add content to the page
-class GoogleAnalyticsHooks  < Redmine::Hook::ViewListener
+class GoogleAnalyticsHooks < Redmine::Hook::ViewListener
 
   # Adds the Google Analytics code to the layout if the current user meets
   # the conditions setup by the System Administrator
diff --git a/rails/init.rb b/rails/init.rb
deleted file mode 100644
index 36d733a..0000000
--- a/rails/init.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-require 'redmine'
-
-require_dependency 'google_analytics_hooks'
-
-Redmine::Plugin.register :google_analytics_plugin do
-  name 'Google Analytics plugin'
-  author 'Eric Davis'
-  description 'Redmine plugin to insert the Google Analytics tracking code into Redmine based on user roles.'
-  url 'https://projects.littlestreamsoftware.com/projects/redmine-analytics'
-  author_url 'http://www.littlestreamsoftware.com'
-  
-  version '0.2.0'
-  
-  requires_redmine :version_or_higher => '0.8.0'
-  
-  settings :default => {
-    'google_analytics_code' => '',
-    'google_analytics_log_anonymous' => true,
-    'google_analytics_log_authenticated' => true,
-    'google_analytics_log_administrator' => true
-  }, :partial => 'settings/google_analytics_settings'
-
-
-end
-