Merge pull request #206 from edolnx/master

Add configure flag to disable multi-os-directory support