Added ability to take filename arguments