Merge pull request #8 from filinpavel/patch-1