Merge pull request #3 from Casyfill/master

update
Merge pull request #45 from Valyuka/master

Merge pull request #3 from Casyfill/master