Merge pull request #175 from fsb4000/master