Merge pull request #148 from kliment/master

Merge fixes added to master into experimental

pronterface.py

@@ -410,7 +410,7 @@ class PronterWindow(wx.Frame,pronsole.pronsole):
             self.serialport.Clear()
             self.serialport.AppendItems(portslist)
         try:
-            if os.path.exists(self.settings.port) or self.settings.port.upper().startswith('COM'):
+            if os.path.exists(self.settings.port) or self.settings.port in scan:
                 self.serialport.SetValue(self.settings.port)
             elif len(portslist)>0:
                 self.serialport.SetValue(portslist[0])