feature/pathlib #2

Open
bbohard wants to merge 2 commits from feature/pathlib into develop

2 Commits