Merge pull request #2 from jiiis/master

change