Merge pull request #51 from fsb4000/master