Added help option, all command line options have to be prepended with a minus.
Merge windows makefile fix.