Merge pull request #42 from dkorolev/master

Order key is now part of the storage key, not storage value.