Merge pull request #1 from DSKarramba/master

update
Create Makefile
Merge pull request #3 from citrux/master

add Makefile