Merge pull request #684 from jack-pappas/patch-7