Added fixes for #2 and support for faxFile