General Makefile
Merge pull request #47 from lefta/v2

General Makefile