Jerad/a pull request 4