Merge. Improve Makefile.
Merge branch 'master' of https://github.com/InverseRE/dark-flame