Jerad/a pull request 10