added sorting
Merge branch 'master' of https://github.com/donwb/yak