modified same file
Merge pull request #1 from galixan/master

modified same file