Merge pull request #22 from stuartf/master

Wrong language chosen from long list
add test for broken sort