Merge pull request #985 from joelmartinez/master