Jerad/a pull request 5