Fix #274 - Temporary build sub-directories paths hardcoded
Merge pull request #312 from ebollens/fix/274

Fix #274 #301 - Temporary build sub-directories paths hardcoded