Fix path joins, closes #9