Jerad/a pull request 7