Code

Merge branch 'ks/sort-wildcard-in-makefile'