Merge pull request #35 from marcusmoller/master

Added makefile
Fixed makefile