Merge pull request #1 from zapiski/master

updejt
Merge pull request #8 from dockiler/master

Merge pull request #1 from zapiski/master