Merge remote-tracking branch 'upstream/master'

Author: Aniket-Engg

contracts/crowdsale/distribution/RefundableCrowdsale.sol

@@ -50,13 +50,13 @@ contract RefundableCrowdsale is FinalizableCrowdsale {
 
   /**
    * @dev Investors can claim refunds here if crowdsale is unsuccessful
-   * @param beneficiary Whose refund will be claimed.
+   * @param refundee Whose refund will be claimed.
    */
-  function claimRefund(address beneficiary) public {
+  function claimRefund(address refundee) public {
     require(finalized());
     require(!goalReached());
 
-    _escrow.withdraw(beneficiary);
+    _escrow.withdraw(refundee);
   }
 
   /**

contracts/examples/SimpleToken.sol

@@ -1,25 +1,22 @@
 pragma solidity ^0.4.24;
 
 import "../token/ERC20/ERC20.sol";
+import "../token/ERC20/ERC20Detailed.sol";
 
 /**
  * @title SimpleToken
  * @dev Very simple ERC20 Token example, where all tokens are pre-assigned to the creator.
  * Note they can later distribute these tokens as they wish using `transfer` and other
  * `ERC20` functions.
  */
-contract SimpleToken is ERC20 {
+contract SimpleToken is ERC20, ERC20Detailed {
 
-  string public constant name = "SimpleToken";
-  string public constant symbol = "SIM";
-  uint8 public constant decimals = 18;
-
-  uint256 public constant INITIAL_SUPPLY = 10000 * (10 ** uint256(decimals));
+  uint256 public constant INITIAL_SUPPLY = 10000 * (10 ** uint256(decimals()));
 
   /**
    * @dev Constructor that gives msg.sender all of existing tokens.
    */
-  constructor() public {
+  constructor() public ERC20Detailed("SimpleToken", "SIM", 18) {
     _mint(msg.sender, INITIAL_SUPPLY);
   }
 

contracts/token/ERC20/ERC20.sol

@@ -171,7 +171,7 @@ contract ERC20 is IERC20 {
    * @param value The amount that will be created.
    */
   function _mint(address account, uint256 value) internal {
-    require(account != 0);
+    require(account != address(0));
     _totalSupply = _totalSupply.add(value);
     _balances[account] = _balances[account].add(value);
     emit Transfer(address(0), account, value);
@@ -184,7 +184,7 @@ contract ERC20 is IERC20 {
    * @param value The amount that will be burnt.
    */
   function _burn(address account, uint256 value) internal {
-    require(account != 0);
+    require(account != address(0));
     require(value <= _balances[account]);
 
     _totalSupply = _totalSupply.sub(value);

contracts/token/ERC721/ERC721Burnable.sol

@@ -2,7 +2,16 @@ pragma solidity ^0.4.24;
 
 import "./ERC721.sol";
 
+/**
+ * @title ERC721 Burnable Token
+ * @dev ERC721 Token that can be irreversibly burned (destroyed).
+ */
 contract ERC721Burnable is ERC721 {
+
+  /**
+   * @dev Burns a specific ERC721 token.
+   * @param tokenId uint256 id of the ERC721 token to be burned.
+   */
   function burn(uint256 tokenId)
     public
   {

contracts/token/ERC721/ERC721Enumerable.sol

@@ -4,6 +4,10 @@ import "./IERC721Enumerable.sol";
 import "./ERC721.sol";
 import "../../introspection/ERC165.sol";
 
+/**
+ * @title ERC-721 Non-Fungible Token with optional enumeration extension logic
+ * @dev See https://github.com/ethereum/EIPs/blob/master/EIPS/eip-721.md
+ */
 contract ERC721Enumerable is ERC165, ERC721, IERC721Enumerable {
   // Mapping from owner to list of owned token IDs
   mapping(address => uint256[]) private _ownedTokens;

test/math/SafeMath.test.js

@@ -53,13 +53,20 @@ contract('SafeMath', function () {
       (await this.safeMath.mul(a, b)).should.be.bignumber.equal(a.times(b));
     });
 
-    it('handles a zero product correctly', async function () {
+    it('handles a zero product correctly (first number as zero)', async function () {
       const a = new BigNumber(0);
       const b = new BigNumber(5678);
 
       (await this.safeMath.mul(a, b)).should.be.bignumber.equal(a.times(b));
     });
 
+    it('handles a zero product correctly (second number as zero)', async function () {
+      const a = new BigNumber(5678);
+      const b = new BigNumber(0);
+
+      (await this.safeMath.mul(a, b)).should.be.bignumber.equal(a.times(b));
+    });
+
     it('throws a revert error on multiplication overflow', async function () {
       const a = MAX_UINT256;
       const b = new BigNumber(2);
@@ -76,6 +83,20 @@ contract('SafeMath', function () {
       (await this.safeMath.div(a, b)).should.be.bignumber.equal(a.div(b));
     });
 
+    it('divides zero correctly', async function () {
+      const a = new BigNumber(0);
+      const b = new BigNumber(5678);
+
+      (await this.safeMath.div(a, b)).should.be.bignumber.equal(0);
+    });
+
+    it('returns complete number result on non-even division', async function () {
+      const a = new BigNumber(7000);
+      const b = new BigNumber(5678);
+
+      (await this.safeMath.div(a, b)).should.be.bignumber.equal(1);
+    });
+
     it('throws a revert error on zero division', async function () {
       const a = new BigNumber(5678);
       const b = new BigNumber(0);