Now handling obsolete paths too #181
- some improvements for #111, #155 and #185