Merge pull request #8 from Weiling-Liao/master

Fix FWS is not trimmed correctly