Merge pull request #54 from fsb4000/master