Jerad/a pull request 2