Merge pull request #23 from kawaiiamber/Makefile-standard