changes to merge up to user-none current master
fixes to make work with Windows

fixes to make work for Windows thanks to Doug
merge from kevinhendricks.