merge
Merge pull request #3 from shkurkin/changes

merge