Merge pull request #185 from fr500/patch-2