Makefile fix for unix
Makefile for cygwin env.
Merge branch 'master' into nothread