Some changes
Merge pull request #26 from serg-kakurin/master

Some changes