Merge pull request #43 from jcabi/master

merge from master to my branch
Issue #398 was implemented
Merge pull request #438 from lthuangiang/398

#438: pull request Issue #398 was implemented