Jerad/a pull request 8