dbetebenner Merge pull request #65 from dbetebenner/master