Fixes issue #51. FWS support!!