Add optional subdir param.
Merge branch 'master' of https://github.com/hmteditors/alums1