Merge pull request #43 from dkorolev/master

Renamed magic_order_key to order_key.
Merge branch 'master', remote-tracking branch 'upstream/master'