Merge pull request #121 from fsb4000/master