Merge pull request #1630 from gpazo/morePreReqs