diff --git a/src/ui/QGCMAVLinkLogPlayer.cc b/src/ui/QGCMAVLinkLogPlayer.cc
index 7c4fc341b2c159f9d1c9d6b8ab4e100f35da0ec9..20b2040790d9a1796e780a98351fc5a8e0f0f443 100644
--- a/src/ui/QGCMAVLinkLogPlayer.cc
+++ b/src/ui/QGCMAVLinkLogPlayer.cc
@@ -18,6 +18,8 @@ QGCMAVLinkLogPlayer::QGCMAVLinkLogPlayer(MAVLinkProtocol* mavlink, QWidget *pare
     mavlink(mavlink),
     logLink(NULL),
     loopCounter(0),
+    mavlinkLogFormat(true),
+    binaryBaudRate(57600),
     ui(new Ui::QGCMAVLinkLogPlayer)
 {
     ui->setupUi(this);
@@ -62,7 +64,20 @@ void QGCMAVLinkLogPlayer::play()
         logLink = new MAVLinkSimulationLink("");
 
         // Start timer
-        loopTimer.start(1);
+        if (mavlinkLogFormat)
+        {
+            loopTimer.start(1);
+        }
+        else
+        {
+            // Read len bytes at a time
+            int len = 100;
+            // Calculate the number of times to read 100 bytes per second
+            // to guarantee the baud rate, then divide 1000 by the number of read
+            // operations to obtain the interval in milliseconds
+            int interval = 1000 / ((binaryBaudRate / 10) / len);
+            loopTimer.start(interval);
+        }
     }
     else
     {
@@ -124,7 +139,7 @@ bool QGCMAVLinkLogPlayer::reset(int packetIndex)
 
 void QGCMAVLinkLogPlayer::selectLogFile()
 {
-    QString fileName = QFileDialog::getOpenFileName(this, tr("Specify MAVLink log file name"), QDesktopServices::storageLocation(QDesktopServices::DesktopLocation), tr("MAVLink Logfile (*.mavlink);;"));
+    QString fileName = QFileDialog::getOpenFileName(this, tr("Specify MAVLink log file name"), QDesktopServices::storageLocation(QDesktopServices::DesktopLocation), tr("MAVLink or Binary Logfile (*.mavlink; *.bin);;"));
 
     loadLogFile(fileName);
 }
@@ -180,6 +195,11 @@ void QGCMAVLinkLogPlayer::loadLogFile(const QString& file)
         startTime = 0;
         ui->logFileNameLabel->setText(tr("%1").arg(logFileInfo.baseName()));
 
+        // Select if binary or MAVLink log format is used
+        mavlinkLogFormat = file.endsWith(".mavlink");
+
+        if (mavlinkLogFormat)
+        {
         // Get the time interval from the logfile
         QByteArray timestamp = logFile.read(timeLen);
 
@@ -205,6 +225,32 @@ void QGCMAVLinkLogPlayer::loadLogFile(const QString& file)
         QString timelabel = tr("%1h:%2m:%3s").arg(hours, 2).arg(minutes, 2).arg(seconds, 2);
         ui->logStatsLabel->setText(tr("%2 MB, %3 packets, %4").arg(logFileInfo.size()/1000000.0f, 0, 'f', 2).arg(logFileInfo.size()/(MAVLINK_MAX_PACKET_LEN+sizeof(quint64))).arg(timelabel));
     }
+        else
+        {
+            QStringList parts = file.split("_");
+
+            if (parts.count() > 1)
+            {
+                bool ok;
+                int rate = parts.last().toInt(&ok);
+                // 9600 baud to 100 MBit
+                if (ok && (rate > 9600 && rate < 100000000))
+                {
+                    // Accept this as valid baudrate
+                    binaryBaudRate = rate;
+                }
+            }
+
+            int seconds = logFileInfo.size() / (binaryBaudRate / 10);
+            int minutes = seconds / 60;
+            int hours = minutes / 60;
+            seconds -= 60*minutes;
+            minutes -= 60*hours;
+
+            QString timelabel = tr("%1h:%2m:%3s").arg(hours, 2).arg(minutes, 2).arg(seconds, 2);
+            ui->logStatsLabel->setText(tr("%2 MB, %4 at %5 KB/s").arg(logFileInfo.size()/1000000.0f, 0, 'f', 2).arg(timelabel).arg(binaryBaudRate/10/1024));
+        }
+    }
 }
 
 /**
@@ -236,6 +282,8 @@ void QGCMAVLinkLogPlayer::jumpToSliderVal(int slidervalue)
  */
 void QGCMAVLinkLogPlayer::logLoop()
 {
+    if (mavlinkLogFormat)
+    {
     bool ok;
 
     // First check initialization
@@ -346,6 +394,30 @@ void QGCMAVLinkLogPlayer::logLoop()
         // Update progress bar
     }
 }
+    else
+    {
+        // Binary format - read at fixed rate
+        const int len = 100;
+        QByteArray chunk = logFile.read(len);
+
+        // Emit this packet
+        emit bytesReady(logLink, chunk);
+
+        // Check if reached end of file before reading next timestamp
+        if (chunk.length() < len || logFile.atEnd())
+        {
+            // Reached end of file
+            reset();
+
+            QString status = tr("Reached end of binary log file.");
+            ui->logStatsLabel->setText(status);
+            MainWindow::instance()->showStatusMessage(status);
+            return;
+        }
+
+
+    }
+}
 
 void QGCMAVLinkLogPlayer::changeEvent(QEvent *e)
 {
diff --git a/src/ui/QGCMAVLinkLogPlayer.h b/src/ui/QGCMAVLinkLogPlayer.h
index 1ec0603cbf45aed830b9450f97f6556568ec00c5..58a459c3b99e7b8c380699f6730d6b9a550b0312 100644
--- a/src/ui/QGCMAVLinkLogPlayer.h
+++ b/src/ui/QGCMAVLinkLogPlayer.h
@@ -61,6 +61,8 @@ protected:
     QFile logFile;
     QTimer loopTimer;
     int loopCounter;
+    bool mavlinkLogFormat;
+    int binaryBaudRate;
     static const int packetLen = MAVLINK_MAX_PACKET_LEN;
     static const int timeLen = sizeof(quint64);
     void changeEvent(QEvent *e);
diff --git a/src/ui/WaypointView.cc b/src/ui/WaypointView.cc
index ca7f981a067b8a8ba2bd41551adce7edc30df990..5723efe74e2c4eb238a42befa3cb7c6a0a119446 100644
--- a/src/ui/WaypointView.cc
+++ b/src/ui/WaypointView.cc
@@ -205,10 +205,15 @@ void WaypointView::changedCurrent(int state)
 
 void WaypointView::updateValues()
 {
+    // Deactivate signals from the WP
+    wp->blockSignals(true);
     // update frame
     MAV_FRAME frame = wp->getFrame();
     int frame_index = m_ui->comboBox_frame->findData(frame);
-    m_ui->comboBox_frame->setCurrentIndex(frame_index);
+    if (m_ui->comboBox_frame->currentIndex() != frame_index)
+    {
+        m_ui->comboBox_frame->setCurrentIndex(frame_index);
+    }
     switch(frame)
     {
     case(MAV_FRAME_LOCAL):
@@ -249,6 +254,7 @@ void WaypointView::updateValues()
     m_ui->idLabel->setText(QString("%1").arg(wp->getId()));\
     m_ui->orbitSpinBox->setValue(wp->getOrbit());
     m_ui->holdTimeSpinBox->setValue(wp->getHoldTime());
+    wp->blockSignals(false);
 }
 
 void WaypointView::setCurrent(bool state)
diff --git a/src/ui/WaypointView.ui b/src/ui/WaypointView.ui
index 7e8610374231f8d08b192da014bf53ae912c2517..f243ca4ccac5b6ba3e83499efb0b94d9502b09a7 100644
--- a/src/ui/WaypointView.ui
+++ b/src/ui/WaypointView.ui
@@ -234,6 +234,9 @@ QProgressBar::chunk#thrustBar {
         <property name="toolTip">
          <string>Position X coordinate</string>
         </property>
+        <property name="wrapping">
+         <bool>false</bool>
+        </property>
         <property name="prefix">
          <string>N </string>
         </property>