Merge from anhinga/development
Fix linux makefile