Merge pull request #80 from jcabi/master

merge to my repo
Merge pull request #81 from lthuangiang/master

Merge pull request #80 from jcabi/master