some modification
Merge pull request #1 from activ12/master

some modification