Merge pull request #50 from Ognian/x-display-order