resolved conflict
Merge pull request #1350 from isocolsky/fix/min_amount

removed min amount check