Merge pull request #2 from fsb4000/master