Merge pull request #226 from fsb4000/master