Merge pull request #21 from jcabi/master

merge from master to my branch
issue #248 - fixed
Merge pull request #249 from lthuangiang/248

issue #248 - fixed