Merge pull request #137 from fsb4000/patch-1