Issue #7 pull request