Changed char array size and termination; work for issue #3
Fixes for makefile OS detection