Merge pull request #1 from woodrufs/nicole_dev

Framework Search Paths fix