Merge pull request #539 from nyuszika7h/testing

Do the previous commit in a more clean way