Added #18 - Support for Fax termination
Merge remote-tracking branch 'origin/2.1'