CAP-1222 - fix for windows.  Added command line options.