merged manders2600 pull request #140