Fixed #35 - normalize paths only when necessary.