Fix #8
Update Path Detection