Merge pull request #72 from igorw-forks/patch-1