Merge pull request #20 from mohae/fix-windows-path

update to consistently use filepath instead of path and add looking in o...