Jerad/a pull request 14