Merge pull request #441 from martinbudden/inav_directories