Merge pull request #38 from ivan-m/patch-1