diff --git a/devsetup.cpp b/devsetup.cpp
index b8836f8b7..ae15c86c5 100644
--- a/devsetup.cpp
+++ b/devsetup.cpp
@@ -85,8 +85,7 @@ void DevSetup::initDlg()
 #ifdef WIN32
 // Needs work to compile for Linux
       p1=(char*)"";
-      p=strstr(pa_device_hostapi,"MME");Pa_GetHostApiInfo(pdi->hostApi)->name
-
+      p=strstr(pa_device_hostapi,"MME");
       if(p!=NULL) p1=(char*)"MME";
       p=strstr(pa_device_hostapi,"Direct");
       if(p!=NULL) p1=(char*)"DirectX";
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 813d50268..9fe71e630 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -1,4 +1,4 @@
-//------------------------------------------------------------ MainWindow
+//------------------------------------------------------------- MainWindow
 #include "mainwindow.h"
 #include "ui_mainwindow.h"
 #include "devsetup.h"
@@ -33,7 +33,7 @@ Rig* rig = NULL;
 QTextEdit* pShortcuts;
 
 QString rev="$Rev$";
-QString Program_Title_Version="  WSJT-X   v0.99, r" + rev.mid(6,4) +
+QString Program_Title_Version="  WSJT-X   v1.0, r" + rev.mid(6,4) +
                               "    by K1JT";
 
 //-------------------------------------------------- MainWindow constructor
@@ -416,6 +416,7 @@ void MainWindow::writeSettings()
   settings.setValue("LogQSOgeom",m_logQSOgeom);
   settings.setValue("Polling",m_poll);
   settings.setValue("OutBufSize",outBufSize);
+  settings.setValue("LockTxFreq",m_lockTxFreq);
   settings.endGroup();
 }
 
@@ -527,6 +528,8 @@ void MainWindow::readSettings()
   m_poll=settings.value("Polling",0).toInt();
   m_logQSOgeom=settings.value("LogQSOgeom",QRect(500,400,424,283)).toRect();
   outBufSize=settings.value("OutBufSize",4096).toInt();
+  m_lockTxFreq=settings.value("LockTxFreq",false).toBool();
+  ui->actionLockTxFreq->setChecked(m_lockTxFreq);
   settings.endGroup();
 
   if(!ui->actionLinrad->isChecked() && !ui->actionCuteSDR->isChecked() &&
@@ -1248,7 +1251,7 @@ void MainWindow::decode()                                       //decode()
   jt9com_.nfb=g_pWideGraph->getFmax();
 
   jt9com_.ntol=3;
-  if(jt9com_.nutc < m_nutc0) m_RxLog |= 1;  //Date and Time to all65.txt
+  if(jt9com_.nutc < m_nutc0) m_RxLog |= 1;  //Date and Time to all.txt
   m_nutc0=jt9com_.nutc;
   jt9com_.nrxlog=m_RxLog;
   jt9com_.nfsample=12000;
@@ -1943,8 +1946,10 @@ void MainWindow::doubleClickOnCall(bool shift, bool ctrl)
   int nfreq=int(t4.at(3).toFloat());
   g_pWideGraph->setQSOfreq(nfreq);       //Set Rx freq
   QString firstcall=t4.at(4);
-  //Don't change freqs if a station is calling me, unless CTRL is held down
-  if(firstcall!=m_myCall or ctrl) ui->TxFreqSpinBox->setValue(nfreq);
+  // Don't change Tx freq if a station is calling me, unless m_lockTxFreq
+  // is true or CTRL is held down or
+  if((firstcall!=m_myCall) or m_lockTxFreq or ctrl)
+    ui->TxFreqSpinBox->setValue(nfreq);
   QString hiscall=t4.at(5);
   QString hisgrid="";
   if(t4.length()>=7)
@@ -2863,3 +2868,9 @@ void MainWindow::on_readFreq_clicked()
   if(ndiff!=0) dialFreqChanged2(fMHz);
 }
 
+
+void MainWindow::on_actionLockTxFreq_triggered(bool checked)
+{
+  m_lockTxFreq=checked;
+  g_pWideGraph->m_lockTxFreq=checked;
+}
diff --git a/mainwindow.h b/mainwindow.h
index 015875871..2fa9906db 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -158,6 +158,8 @@ private slots:
 
   void on_readFreq_clicked();
 
+  void on_actionLockTxFreq_triggered(bool checked);
+
 private:
     Ui::MainWindow *ui;
 
@@ -255,6 +257,7 @@ private:
     bool    m_bDTRoff;
     bool    m_pttData;
     bool    m_dontReadFreq;
+    bool    m_lockTxFreq;
 
     char    m_decoded[80];
 
diff --git a/mainwindow.ui b/mainwindow.ui
index 8a1e2885e..d1d3f52bd 100644
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -2271,6 +2271,7 @@ p, li { white-space: pre-wrap; }
     <addaction name="action_73TxDisable"/>
     <addaction name="actionRunaway_Tx_watchdog"/>
     <addaction name="actionTx2QSO"/>
+    <addaction name="actionLockTxFreq"/>
     <addaction name="separator"/>
     <addaction name="menuAdvanced"/>
    </widget>
@@ -2848,6 +2849,19 @@ p, li { white-space: pre-wrap; }
     <string>Allow multiple instances</string>
    </property>
   </action>
+  <action name="actionTx_frequency_always_follows_Rx_frequency">
+   <property name="text">
+    <string>Tx frequency always follows Rx frequency</string>
+   </property>
+  </action>
+  <action name="actionLockTxFreq">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Tx freq locked to Rx freq</string>
+   </property>
+  </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>
diff --git a/widegraph.cpp b/widegraph.cpp
index ce47517b4..3deed3a35 100644
--- a/widegraph.cpp
+++ b/widegraph.cpp
@@ -176,6 +176,7 @@ void WideGraph::setQSOfreq(int n)
 {
   m_qsoFreq=n;
   ui->widePlot->setFQSO(m_qsoFreq,true);
+  if(m_lockTxFreq) setTxFreq(m_qsoFreq);
 }
 
 int WideGraph::QSOfreq()
diff --git a/widegraph.h b/widegraph.h
index 872ba07c9..0298c8741 100644
--- a/widegraph.h
+++ b/widegraph.h
@@ -34,6 +34,7 @@ public:
   double fGreen();
 
   qint32 m_qsoFreq;
+  bool   m_lockTxFreq;
 
 signals:
   void freezeDecode2(int n);