Issue #97 done

Gooder paths

(ignore commit 8749ab2e029452345bf143f8712a7f4ed8ee9598)