Merge pull request #1 from zapiski/master

updejt