Fixed Issue #83, #85. Adding order by name.