Merge pull request #560 from kbknapp/issue-558

Issue 558