Merge @Lowest0ne's changed makefile
I did not include the rename of @ne555's makefile (it should be the official makefile)