Merge pull request #18 from kawaiiamber/config.mk