new changes
Merge pull request #2 from tepeka/master

new changes