From 653b154b0ea50cd53727abee82b361f2565b9304 Mon Sep 17 00:00:00 2001
From: Francisco Giordano <frangio.1@gmail.com>
Date: Tue, 25 Sep 2018 17:32:54 -0300
Subject: [PATCH] convert ERC20

---
 contracts/mocks/ERC20Mock.sol   | 3 ++-
 contracts/token/ERC20/ERC20.sol | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/contracts/mocks/ERC20Mock.sol b/contracts/mocks/ERC20Mock.sol
index 046730750..827789763 100644
--- a/contracts/mocks/ERC20Mock.sol
+++ b/contracts/mocks/ERC20Mock.sol
@@ -1,10 +1,11 @@
 pragma solidity ^0.4.24;
 
+import "../Initializable.sol";
 import "../token/ERC20/ERC20.sol";
 
 
 // mock class using ERC20
-contract ERC20Mock is ERC20 {
+contract ERC20Mock is Initializable, ERC20 {
 
   constructor(address initialAccount, uint256 initialBalance) public {
     _mint(initialAccount, initialBalance);
diff --git a/contracts/token/ERC20/ERC20.sol b/contracts/token/ERC20/ERC20.sol
index d1f3094d4..673396e27 100644
--- a/contracts/token/ERC20/ERC20.sol
+++ b/contracts/token/ERC20/ERC20.sol
@@ -1,5 +1,6 @@
 pragma solidity ^0.4.24;
 
+import "../../Initializable.sol";
 import "./IERC20.sol";
 import "../../math/SafeMath.sol";
 
@@ -11,7 +12,7 @@ import "../../math/SafeMath.sol";
  * https://github.com/ethereum/EIPs/blob/master/EIPS/eip-20.md
  * Originally based on code by FirstBlood: https://github.com/Firstbloodio/token/blob/master/smart_contract/FirstBloodToken.sol
  */
-contract ERC20 is IERC20 {
+contract ERC20 is Initializable, IERC20 {
   using SafeMath for uint256;
 
   mapping (address => uint256) private _balances;