Merge pull request #3 from fsb4000/master