Fix #9
Update Path Detection