Create makefiles
Merge branch 'master' into gcc-version
Refactoring
Merge branch 'gcc-version'