Merge pull request #9 from t-nelson/fix_vpath_build