Added support for multiple files to be processed
More testing