Merge pull request #120 from ahyear/master

Fix order by name