diff --git a/.solhint.json b/.solhint.json
new file mode 100644
index 00000000..218de574
--- /dev/null
+++ b/.solhint.json
@@ -0,0 +1,12 @@
+{
+  "extends": "default",
+  "rules": {
+    "avoid-call-value": "warn",
+    "const-name-snakecase": "warn",
+    "func-name-mixedcase": "warn",
+    "func-order": "warn",
+    "func-param-name-mixedcase": "warn",
+    "var-name-mixedcase": "warn",
+    "visibility-modifier-order": "warn"
+  }
+}
diff --git a/contracts/Factory.sol b/contracts/Factory.sol
index 18841dd3..6f33a4a9 100644
--- a/contracts/Factory.sol
+++ b/contracts/Factory.sol
@@ -1,5 +1,6 @@
 pragma solidity ^0.4.15;
 
+
 contract Factory {
 
     /*
diff --git a/contracts/Migrations.sol b/contracts/Migrations.sol
index 0507024f..4e57dbd7 100644
--- a/contracts/Migrations.sol
+++ b/contracts/Migrations.sol
@@ -1,23 +1,24 @@
 pragma solidity ^0.4.15;
 
+
 contract Migrations {
-  address public owner;
-  uint public last_completed_migration;
+    address public owner;
+    uint public last_completed_migration;
 
-  modifier restricted() {
-    if (msg.sender == owner) _;
-  }
+    modifier restricted() {
+        if (msg.sender == owner) _;
+    }
 
-  function Migrations() {
-    owner = msg.sender;
-  }
+    function Migrations() {
+        owner = msg.sender;
+    }
 
-  function setCompleted(uint completed) restricted {
-    last_completed_migration = completed;
-  }
+    function setCompleted(uint completed) restricted {
+        last_completed_migration = completed;
+    }
 
-  function upgrade(address new_address) restricted {
-    Migrations upgraded = Migrations(new_address);
-    upgraded.setCompleted(last_completed_migration);
-  }
+    function upgrade(address new_address) restricted {
+        Migrations upgraded = Migrations(new_address);
+        upgraded.setCompleted(last_completed_migration);
+    }
 }
diff --git a/contracts/MultiSigWallet.sol b/contracts/MultiSigWallet.sol
index 4b200693..153f14f9 100644
--- a/contracts/MultiSigWallet.sol
+++ b/contracts/MultiSigWallet.sol
@@ -109,7 +109,7 @@ contract MultiSigWallet {
         public
         validRequirement(_owners.length, _required)
     {
-        for (uint i=0; i<_owners.length; i++) {
+        for (uint i = 0; i < _owners.length; i++) {
             require(!isOwner[_owners[i]] && _owners[i] != 0);
             isOwner[_owners[i]] = true;
         }
@@ -139,7 +139,7 @@ contract MultiSigWallet {
         ownerExists(owner)
     {
         isOwner[owner] = false;
-        for (uint i=0; i<owners.length - 1; i++)
+        for (uint i = 0; i < owners.length - 1; i++)
             if (owners[i] == owner) {
                 owners[i] = owners[owners.length - 1];
                 break;
@@ -159,7 +159,7 @@ contract MultiSigWallet {
         ownerExists(owner)
         ownerDoesNotExist(newOwner)
     {
-        for (uint i=0; i<owners.length; i++)
+        for (uint i = 0; i < owners.length; i++)
             if (owners[i] == owner) {
                 owners[i] = newOwner;
                 break;
@@ -244,12 +244,14 @@ contract MultiSigWallet {
     function external_call(address destination, uint value, uint dataLength, bytes data) private returns (bool) {
         bool result;
         assembly {
-            let x := mload(0x40)   // "Allocate" memory for output (0x40 is where "free memory" pointer is stored by convention)
+            let x := mload(0x40)   // "Allocate" memory for output (0x40 is where "free memory"
+                                    // pointer is stored by convention)
             let d := add(data, 32) // First 32 bytes are the padded length of data, so exclude that
             result := call(
                 sub(gas, 34710),   // 34710 is the value that solidity is currently emitting
-                                   // It includes callGas (700) + callVeryLow (3, to pay for SUB) + callValueTransferGas (9000) +
-                                   // callNewAccountGas (25000, in case the destination address does not exist and needs creating)
+                                   // It includes callGas (700) + callVeryLow (3, to pay for SUB) +
+                                   // callValueTransferGas (9000) + callNewAccountGas (25000, in case
+                                   // the destination address does not exist and needs creating)
                 destination,
                 value,
                 d,
@@ -270,7 +272,7 @@ contract MultiSigWallet {
         returns (bool)
     {
         uint count = 0;
-        for (uint i=0; i<owners.length; i++) {
+        for (uint i = 0; i < owners.length; i++) {
             if (confirmations[transactionId][owners[i]])
                 count += 1;
             if (count == required)
@@ -313,7 +315,7 @@ contract MultiSigWallet {
         constant
         returns (uint count)
     {
-        for (uint i=0; i<owners.length; i++)
+        for (uint i = 0; i < owners.length; i++)
             if (confirmations[transactionId][owners[i]])
                 count += 1;
     }
@@ -327,9 +329,8 @@ contract MultiSigWallet {
         constant
         returns (uint count)
     {
-        for (uint i=0; i<transactionCount; i++)
-            if (   pending && !transactions[i].executed
-                || executed && transactions[i].executed)
+        for (uint i = 0; i < transactionCount; i++)
+            if (pending && !transactions[i].executed || executed && transactions[i].executed)
                 count += 1;
     }
 
@@ -354,13 +355,13 @@ contract MultiSigWallet {
         address[] memory confirmationsTemp = new address[](owners.length);
         uint count = 0;
         uint i;
-        for (i=0; i<owners.length; i++)
+        for (i = 0; i < owners.length; i++)
             if (confirmations[transactionId][owners[i]]) {
                 confirmationsTemp[count] = owners[i];
                 count += 1;
             }
         _confirmations = new address[](count);
-        for (i=0; i<count; i++)
+        for (i = 0; i < count; i++)
             _confirmations[i] = confirmationsTemp[i];
     }
 
@@ -378,15 +379,13 @@ contract MultiSigWallet {
         uint[] memory transactionIdsTemp = new uint[](transactionCount);
         uint count = 0;
         uint i;
-        for (i=0; i<transactionCount; i++)
-            if (   pending && !transactions[i].executed
-                || executed && transactions[i].executed)
-            {
+        for (i = 0; i < transactionCount; i++)
+            if (pending && !transactions[i].executed || executed && transactions[i].executed) {
                 transactionIdsTemp[count] = i;
                 count += 1;
             }
         _transactionIds = new uint[](to - from);
-        for (i=from; i<to; i++)
+        for (i = from; i < to; i++)
             _transactionIds[i - from] = transactionIdsTemp[i];
     }
 }
diff --git a/contracts/TestCalls.sol b/contracts/TestCalls.sol
index f9f45721..3cf18d51 100644
--- a/contracts/TestCalls.sol
+++ b/contracts/TestCalls.sol
@@ -4,40 +4,40 @@ pragma solidity ^0.4.15;
 /// @title Contract for testing low-level calls issued from the multisig wallet
 contract TestCalls {
 
-	// msg.data.length of the latest call to "receive" methods
-	uint public lastMsgDataLength;
+    // msg.data.length of the latest call to "receive" methods
+    uint public lastMsgDataLength;
 
-	// msg.value of the latest call to "receive" methods
-	uint public lastMsgValue;
+    // msg.value of the latest call to "receive" methods
+    uint public lastMsgValue;
 
-	uint public uint1;
-	uint public uint2;
-	bytes public byteArray1;
+    uint public uint1;
+    uint public uint2;
+    bytes public byteArray1;
 
-	modifier setMsgFields {
-		lastMsgDataLength = msg.data.length;
-		lastMsgValue = msg.value;
-		_;
-	}
+    modifier setMsgFields {
+        lastMsgDataLength = msg.data.length;
+        lastMsgValue = msg.value;
+        _;
+    }
 
-	function TestCalls() setMsgFields public {
-		// This constructor will be used to test the creation via multisig wallet
-	}
+    function TestCalls() setMsgFields public {
+        // This constructor will be used to test the creation via multisig wallet
+    }
 
-	function receive1uint(uint a) setMsgFields payable public {
-		uint1 = a;
-	}
+    function receive1uint(uint a) setMsgFields payable public {
+        uint1 = a;
+    }
 
-	function receive2uints(uint a, uint b) setMsgFields payable public {
-		uint1 = a;
-		uint2 = b;
-	}
+    function receive2uints(uint a, uint b) setMsgFields payable public {
+        uint1 = a;
+        uint2 = b;
+    }
 
-	function receive1bytes(bytes c) setMsgFields payable public {
-		byteArray1 = c;
-	}
+    function receive1bytes(bytes c) setMsgFields payable public {
+        byteArray1 = c;
+    }
 
-	function nonPayable() setMsgFields public {
-	}
+    function nonPayable() setMsgFields public {
+    }
 
-}
\ No newline at end of file
+}
diff --git a/package.json b/package.json
index 35fbb0bd..2aa39df3 100644
--- a/package.json
+++ b/package.json
@@ -5,6 +5,7 @@
   "scripts": {
     "test-dapp": "cd dapp && npm test",
     "test": "sh truffle_test_runner.sh",
+    "lint-contracts": "solhint contracts/**/*.sol",
     "install": "cd dapp && npm install",
     "start": "cd dapp && npm start"
   },
@@ -36,6 +37,7 @@
     "eslint-config-airbnb": "^15.1.0",
     "eslint-plugin-import": "^2.7.0",
     "eslint-plugin-jsx-a11y": "^5.1.1",
-    "eslint-plugin-react": "^7.3.0"
+    "eslint-plugin-react": "^7.3.0",
+    "solhint": "^1.1.10"
   }
 }