--input_directory as per #32
Merged from dev