Fixes #255
Fixes #255
Merge pull request #256 from theponti/fix/sort-lists-alphabetically-#255

Fixes #255
Merge pull request #257 from theponti/development

Development