Merge pull request #157 from ivankravets/patch-1