Merge pull request #245 from homul/master

TRWS called fixed