veorq Merge pull request #25 from skaunov/patch-1