Merge pull request #184 from fsb4000/patch-2