Merge pull request #121 from NeoRaider/build-paths