Merge pull request #2 from zapiski/master

rebase
Merge pull request #48 from dockiler/master

Merge pull request #2 from zapiski/master