155: Add str to cleaup
Merge pull request #156 from omergertel/dev

Add str to cleaup