Git pull request 12/17/14