for #26: enable subfoldr sorting
Merge branch 'master' into gh-pages
'deploy'