Merge pull request #1 from FH235918/master

bug ista fixed
testing to clear later