Merge pull request #213 from r-burns/master

Fix cmake path assumptions