Merge pull request #665 from tigercomputing/master