Made path detection more generic
1.1.0
Merged