Pull Request 17

__Resolution__
resolved testing