dguido Merge pull request #100 from IanWalston/master