diff --git a/.npm/package/npm-shrinkwrap.json b/.npm/package/npm-shrinkwrap.json
index 1a320fd..7af2ca8 100644
--- a/.npm/package/npm-shrinkwrap.json
+++ b/.npm/package/npm-shrinkwrap.json
@@ -1,7 +1,9 @@
 {
   "dependencies": {
     "piwik-tracker": {
-      "version": "0.1.1"
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/piwik-tracker/-/piwik-tracker-1.0.0.tgz",
+      "from": "piwik-tracker@1.0.0"
     }
   }
 }
diff --git a/README.md b/README.md
index c7f6256..479fa02 100644
--- a/README.md
+++ b/README.md
@@ -1,26 +1,28 @@
-# davidsichau:piwik
+# vjrj:piwik
 Meteor package that allows you to use Piwik Analytics with your application.
 
-An improved fork of https://github.com/appjitsu/piwik/. Thanks for the great work.
+An improved fork of https://github.com/appjitsu/piwik/ and https://github.com/DavidSichau/piwik/ . Thanks for the great work.
 
 This package uses piwik-tracker (https://www.npmjs.com/package/piwik-tracker).
 
 #### Installation
 
 ```
-meteor add davidsichau:piwik
+meteor add vjrj:piwik
 ```
 
 #### Setup
 
 Add the following Environmentsvariables
 ```
-PIWIK_SITE_ID = `http://your_piwik_server_url/piwik.php"`
-PIWIK_URL = `0`
+PIWIK_URL = `http://your_piwik_server_url/piwik.php"`
+PIWIK_SITE_ID = `0`
 PIWIK_TOKEN = `<YOUR SECRET PIWIK TOKEN>`
 
 ```
 
+or via [settings.json](https://github.com/vjrj/piwik/blob/master/settings.json).
+
 #### Usage
 
 On the client serveral helpers functions are provided to track different statistics.
diff --git a/package.js b/package.js
index 6efd45b..09a515c 100644
--- a/package.js
+++ b/package.js
@@ -3,17 +3,22 @@ Package.describe({
     // Short two-sentence summary.
     summary: "Piwik tracking for Meteor.",
     // Version number.
-    version: "0.2.1",
+    version: "0.3.1",
     // Optional.  Default is package directory name.
-    name: "davidsichau:piwik",
+    name: "vjrj:piwik",
     documentation: 'README.md',
 
-    git: 'https://github.com/DavidSichau/piwik'
+    git: 'https://github.com/vjrj/piwik'
 });
 
 /* This defines your actual package */
 Package.onUse(function (api) {
-    api.versionsFrom('1.1.0.2');
+    api.versionsFrom('1.2.1');
+    api.use([
+       'ecmascript',
+       'check'
+    ]);
+
     var both = ["client", "server"];
 
     api.addFiles(['client/piwik.js'], ['client']);
@@ -22,5 +27,5 @@ Package.onUse(function (api) {
 
 /* This lets you use npm packages in your package*/
 Npm.depends({
-    "piwik-tracker": "0.1.1"
+    "piwik-tracker": "1.0.0"
 });
diff --git a/server/piwik.js b/server/piwik.js
index f1a43ec..8e14d34 100644
--- a/server/piwik.js
+++ b/server/piwik.js
@@ -1,7 +1,7 @@
 var PiwikTracker = Npm.require('piwik-tracker');
 
-var site_id = process.env.PIWIK_SITE_ID;
-var piwik_url = process.env.PIWIK_URL;
+var site_id = process.env.PIWIK_SITE_ID || Meteor.settings.piwik.site_id ;
+var piwik_url = process.env.PIWIK_URL || Meteor.settings.piwik.url;
 
 
 //stup for development settings