Bug/defaultpath

N.B. this change depends on pull #125 (but is unrelated) to avoid having to do complicated merges of both.