Merge branch 'makefile' - closes #13