Updated Setup Script
Merge pull request #182 from blackberry/next-180

Updated Setup Script