Merge pull request #6 from FreeBirdLjj/EnhancedMakefile