Slightly adjusted make files to fix build errors - View it on GitHub