dbetebenner Merge pull request #41 from dbetebenner/master