dbetebenner Merge pull request #600 from dbetebenner/master