Merge pull request #953 from Sushisource/graphivz_fix