Search path fixes #6

Closed
Retropikzel wants to merge 5 commits from development into master

5 Commits