COM ports listed for Windows
Merge branch 'upstream'
re-added console output
Merge branch 'upstream'
build