Merge pull request #945 from joelmartinez/master