Jerad/a pull request 3