Cleaner path handling
Fix #1