Jerad/a pull request 17