Adjusted code to support new FWP() function
Version 1.2.0