Merge pull request #1039 from joelmartinez/master