Merge pull request #1 from s1rius/change

Change