Updated cmd script for latest Cygwin (64bit)
Updated sh script to match latest changes of master