Merge pull request #679 from jack-pappas/patch-6