Merge pull request #186 from fr500/patch-3