Merge branches 'makefile' and 'github'