Fixed som broken paths - should fix issue #17