New branch with makefiles
Merge branches 'makefiles' and 'master'