modernized MarginCriterion
Merge pull request #80 from szagoruyko/margincriterion

modernized MarginCriterion