Added multifile support, as well as command-line argument support