some changes
Merge pull request #364 from maxbugaenko/master

some changes