Merge pull request #38 from dkorolev/master

OrderKey refactoring.