Merge pull request #3 from zapiski/master

Update