Merge pull request #60 from jcabi/master

merge to my repo
Issue #593 - fixed
Merge pull request #594 from lthuangiang/593

#594: pull request Issue #593