Updated paths and fixed for use from Windows command prompt.