other commit
Merge pull request #3 from volovva/third-master

other commit