Merge pull request #2 from barak/master

add Makefile and squash warnings