diff --git a/contracts/polls/PollManager.sol b/contracts/polls/PollManager.sol
index 7204157..ed9b56b 100644
--- a/contracts/polls/PollManager.sol
+++ b/contracts/polls/PollManager.sol
@@ -146,6 +146,32 @@ contract PollManager is LowLevelStringManipulator, Controlled {
         emit Vote(_idPoll, msg.sender, _ballot, amount);
     }
 
+    function customVote(uint _idPoll, bytes32 _ballot, uint _amount) public {
+        require(_idPoll < _polls.length);
+
+        Poll storage p = _polls[_idPoll];
+
+        require(block.number >= p.startBlock && block.number < p.endBlock && !p.canceled);
+
+        unvote(_idPoll);
+
+        uint balance = MiniMeToken(p.token).balanceOf(msg.sender);
+
+        require(balance != 0 && balance >= _amount);
+        require(MiniMeToken(p.token).transferFrom(msg.sender, address(this), _amount));
+
+        p.votes[msg.sender].ballot = _ballot;
+        p.votes[msg.sender].amount = _amount;
+        
+        p.voters++;
+
+        p.votersPerBallot[_ballot]++;
+
+        require(IPollContract(p.pollContract).deltaVote(int(_amount), _ballot));
+
+        emit Vote(_idPoll, msg.sender, _ballot, _amount);
+    }
+
     function unvote(uint _idPoll) public {
         require(_idPoll < _polls.length);
         Poll storage p = _polls[_idPoll];
diff --git a/test/votingdapp.js b/test/votingdapp.js
index 277ddaf..c7089be 100644
--- a/test/votingdapp.js
+++ b/test/votingdapp.js
@@ -123,6 +123,9 @@ describe("VotingDapp", function () {
         receipt = await PollManager.methods.vote(pollId, Yes).send({from: accounts[0]});
         assert.equal(!!receipt.events.Vote, true, "Vote not triggered");
         
+        receipt = await PollManager.methods.customVote(pollId, Yes, 12).send({from: accounts[1]});
+        assert.equal(!!receipt.events.Vote, true, "Vote not triggered");
+        
 
         // ===================================================
         // Getting what option the voter selected
@@ -152,7 +155,7 @@ describe("VotingDapp", function () {
         // console.dir(poll);
 
         // Contains how many votes has a ballot
-        // console.log(tokenVotesByBallotYES); 
+        //console.log(tokenVotesByBallotYES); 
 
         // Contains how many votes has a ballot using quadratic voting
         //console.log(quadraticVotesByBallotYES);
@@ -164,7 +167,6 @@ describe("VotingDapp", function () {
         // Unvote
         receipt = await PollManager.methods.unvote(pollId).send({from: accounts[0]});
         assert.equal(!!receipt.events.Unvote, true, "Unvote not triggered");
-
     });
 
 });