added makefile
changes for linux compatibility
Merge remote-tracking branch 'origin/master'