Merge pull request #2 from zapiski/master

rebase