Merge pull request #3 from zapiski/master

n
Merge pull request #18 from dockiler/master

Merge pull request #3 from zapiski/master