Merge pull request #127 from yosiat/master

Fixing ordering of the list