diff --git a/contracts/token/VestedToken.sol b/contracts/token/VestedToken.sol
index a697bd652..68be5b831 100644
--- a/contracts/token/VestedToken.sol
+++ b/contracts/token/VestedToken.sol
@@ -45,7 +45,8 @@ contract VestedToken is StandardToken {
       throw;
     }
 
-    TokenGrant memory grant = TokenGrant({start: _start, value: _value, cliff: _cliff, vesting: _vesting, granter: msg.sender});
+
+    TokenGrant memory grant = TokenGrant(msg.sender, _value, _cliff, _vesting, _start);
     grants[_to].push(grant);
 
     transfer(_to, _value);
diff --git a/ethpm.json b/ethpm.json
new file mode 100644
index 000000000..92922fd77
--- /dev/null
+++ b/ethpm.json
@@ -0,0 +1,17 @@
+{
+  "package_name": "zeppelin",
+  "version": "1.0.3",
+  "description": "Secure Smart Contract library for Solidity",
+  "authors": [
+    "Manuel Araoz <manuelaraoz@gmail.com>"
+  ],
+  "keywords": [
+    "solidity",
+    "ethereum",
+    "smart",
+    "contracts",
+    "security",
+    "zeppelin"
+  ],
+  "license": "MIT"
+}
diff --git a/package.json b/package.json
index 934f4ede5..0d2f6b793 100644
--- a/package.json
+++ b/package.json
@@ -3,14 +3,6 @@
   "version": "1.0.3",
   "description": "Secure Smart Contract library for Solidity",
   "main": "truffle.js",
-  "devDependencies": {
-    "babel-preset-es2015": "^6.18.0",
-    "babel-preset-stage-2": "^6.18.0",
-    "babel-preset-stage-3": "^6.17.0",
-    "babel-register": "^6.23.0",
-    "ethereumjs-testrpc": "^3.0.2",
-    "truffle": "https://github.com/ConsenSys/truffle.git#3.1.9"
-  },
   "scripts": {
     "test": "scripts/test.sh",
     "console": "truffle console",
@@ -33,5 +25,16 @@
   "bugs": {
     "url": "https://github.com/OpenZeppelin/zeppelin-solidity/issues"
   },
-  "homepage": "https://github.com/OpenZeppelin/zeppelin-solidity"
+  "homepage": "https://github.com/OpenZeppelin/zeppelin-solidity",
+  "dependencies": {
+    "truffle-hdwallet-provider": "0.0.3"
+  },
+  "devDependencies": {
+    "babel-preset-es2015": "^6.18.0",
+    "babel-preset-stage-2": "^6.18.0",
+    "babel-preset-stage-3": "^6.17.0",
+    "babel-register": "^6.23.0",
+    "ethereumjs-testrpc": "^3.0.2",
+    "truffle": "https://github.com/ConsenSys/truffle.git#3.1.9"
+  }
 }
diff --git a/truffle.js b/truffle.js
index f7215a966..d101dc5bf 100644
--- a/truffle.js
+++ b/truffle.js
@@ -1,12 +1,22 @@
 require('babel-register');
 require('babel-polyfill');
 
+var HDWalletProvider = require('truffle-hdwallet-provider');
+
+var mnemonic = '[REDACTED]';
+var provider = new HDWalletProvider(mnemonic, 'https://ropsten.infura.io/');
+
+
 module.exports = {
   networks: {
     development: {
-      host: "localhost",
+      host: 'localhost',
       port: 8545,
-      network_id: "*"
+      network_id: '*'
+    },
+    ropsten: {
+      provider: provider,
+      network_id: 3 // official id of the ropsten network
     }
   }
 };