diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 7f57281..05d5617 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -6,6 +6,12 @@ ENDIF(SDR_WITH_QT5 AND SDR_WITH_FFTW AND SDR_WITH_PORTAUDIO)
 IF(SDR_WITH_PORTAUDIO)
  add_executable(sdr_wavplay sdr_wavplay.cc)
  target_link_libraries(sdr_wavplay ${LIBS} libsdr)
+
+ add_executable(sdr_fm sdr_fm.cc)
+ target_link_libraries(sdr_fm ${LIBS} libsdr)
+
+add_executable(sdr_afsk1200 sdr_afsk1200.cc)
+target_link_libraries(sdr_afsk1200 ${LIBS} libsdr)
 ENDIF(SDR_WITH_PORTAUDIO)
 
 IF(SDR_WITH_QT5 AND SDR_WITH_FFTW AND SDR_WITH_PORTAUDIO)
@@ -16,5 +22,3 @@ ENDIF(SDR_WITH_QT5 AND SDR_WITH_FFTW AND SDR_WITH_PORTAUDIO)
 add_executable(sdr_psk31 sdr_psk31.cc)
 target_link_libraries(sdr_psk31 ${LIBS} ${QT_LIBRARIES} libsdr libsdr-gui)
 
-add_executable(sdr_fm sdr_fm.cc)
-target_link_libraries(sdr_fm ${LIBS} libsdr)
diff --git a/examples/sdr_afsk1200.cc b/examples/sdr_afsk1200.cc
new file mode 100644
index 0000000..b604574
--- /dev/null
+++ b/examples/sdr_afsk1200.cc
@@ -0,0 +1,324 @@
+#include "wavfile.hh"
+#include "autocast.hh"
+#include "interpolate.hh"
+
+using namespace sdr;
+
+static const uint16_t crc_ccitt_table[] = {
+    0x0000, 0x1189, 0x2312, 0x329b, 0x4624, 0x57ad, 0x6536, 0x74bf,
+    0x8c48, 0x9dc1, 0xaf5a, 0xbed3, 0xca6c, 0xdbe5, 0xe97e, 0xf8f7,
+    0x1081, 0x0108, 0x3393, 0x221a, 0x56a5, 0x472c, 0x75b7, 0x643e,
+    0x9cc9, 0x8d40, 0xbfdb, 0xae52, 0xdaed, 0xcb64, 0xf9ff, 0xe876,
+    0x2102, 0x308b, 0x0210, 0x1399, 0x6726, 0x76af, 0x4434, 0x55bd,
+    0xad4a, 0xbcc3, 0x8e58, 0x9fd1, 0xeb6e, 0xfae7, 0xc87c, 0xd9f5,
+    0x3183, 0x200a, 0x1291, 0x0318, 0x77a7, 0x662e, 0x54b5, 0x453c,
+    0xbdcb, 0xac42, 0x9ed9, 0x8f50, 0xfbef, 0xea66, 0xd8fd, 0xc974,
+    0x4204, 0x538d, 0x6116, 0x709f, 0x0420, 0x15a9, 0x2732, 0x36bb,
+    0xce4c, 0xdfc5, 0xed5e, 0xfcd7, 0x8868, 0x99e1, 0xab7a, 0xbaf3,
+    0x5285, 0x430c, 0x7197, 0x601e, 0x14a1, 0x0528, 0x37b3, 0x263a,
+    0xdecd, 0xcf44, 0xfddf, 0xec56, 0x98e9, 0x8960, 0xbbfb, 0xaa72,
+    0x6306, 0x728f, 0x4014, 0x519d, 0x2522, 0x34ab, 0x0630, 0x17b9,
+    0xef4e, 0xfec7, 0xcc5c, 0xddd5, 0xa96a, 0xb8e3, 0x8a78, 0x9bf1,
+    0x7387, 0x620e, 0x5095, 0x411c, 0x35a3, 0x242a, 0x16b1, 0x0738,
+    0xffcf, 0xee46, 0xdcdd, 0xcd54, 0xb9eb, 0xa862, 0x9af9, 0x8b70,
+    0x8408, 0x9581, 0xa71a, 0xb693, 0xc22c, 0xd3a5, 0xe13e, 0xf0b7,
+    0x0840, 0x19c9, 0x2b52, 0x3adb, 0x4e64, 0x5fed, 0x6d76, 0x7cff,
+    0x9489, 0x8500, 0xb79b, 0xa612, 0xd2ad, 0xc324, 0xf1bf, 0xe036,
+    0x18c1, 0x0948, 0x3bd3, 0x2a5a, 0x5ee5, 0x4f6c, 0x7df7, 0x6c7e,
+    0xa50a, 0xb483, 0x8618, 0x9791, 0xe32e, 0xf2a7, 0xc03c, 0xd1b5,
+    0x2942, 0x38cb, 0x0a50, 0x1bd9, 0x6f66, 0x7eef, 0x4c74, 0x5dfd,
+    0xb58b, 0xa402, 0x9699, 0x8710, 0xf3af, 0xe226, 0xd0bd, 0xc134,
+    0x39c3, 0x284a, 0x1ad1, 0x0b58, 0x7fe7, 0x6e6e, 0x5cf5, 0x4d7c,
+    0xc60c, 0xd785, 0xe51e, 0xf497, 0x8028, 0x91a1, 0xa33a, 0xb2b3,
+    0x4a44, 0x5bcd, 0x6956, 0x78df, 0x0c60, 0x1de9, 0x2f72, 0x3efb,
+    0xd68d, 0xc704, 0xf59f, 0xe416, 0x90a9, 0x8120, 0xb3bb, 0xa232,
+    0x5ac5, 0x4b4c, 0x79d7, 0x685e, 0x1ce1, 0x0d68, 0x3ff3, 0x2e7a,
+    0xe70e, 0xf687, 0xc41c, 0xd595, 0xa12a, 0xb0a3, 0x8238, 0x93b1,
+    0x6b46, 0x7acf, 0x4854, 0x59dd, 0x2d62, 0x3ceb, 0x0e70, 0x1ff9,
+    0xf78f, 0xe606, 0xd49d, 0xc514, 0xb1ab, 0xa022, 0x92b9, 0x8330,
+    0x7bc7, 0x6a4e, 0x58d5, 0x495c, 0x3de3, 0x2c6a, 0x1ef1, 0x0f78
+};
+
+static inline bool check_crc_ccitt(const uint8_t *buf, int cnt)
+{
+    uint32_t crc = 0xffff;
+    for (; cnt > 0; cnt--, buf++) {
+        crc = (crc >> 8) ^ crc_ccitt_table[(crc ^ (*buf)) & 0xff];
+    }
+    return (crc & 0xffff) == 0xf0b8;
+}
+
+
+class AFSK: public Sink<int16_t>, public Source {
+public:
+  AFSK(double baud=1200.0, double Fmark=1200.0, double Fspace=2200.0)
+    : Sink<int16_t>(), Source(), _baud(baud), _Fmark(Fmark), _Fspace(Fspace)
+  {
+    // pass...
+  }
+
+  virtual ~AFSK() {
+    // pass...
+  }
+
+  virtual void config(const Config &src_cfg) {
+    // Check if config is complete
+    if (!src_cfg.hasType() || !src_cfg.hasSampleRate()) { return; }
+
+    // Check if buffer type matches
+    if (Config::typeId<int16_t>() != src_cfg.type()) {
+      ConfigError err;
+      err << "Can not configure AFSK1200: Invalid type " << src_cfg.type()
+          << ", expected " << Config::typeId<int16_t>();
+      throw err;
+    }
+
+    // The sample rate
+    _sampleRate = src_cfg.sampleRate();
+    // Symbols per bit (limit to 32 symbols per bit)
+    _corrLen = std::min(int(_sampleRate/_baud), 32);
+    // Samples per symbol (fractional):
+    //  The resulting sub-sampling will have a symbol rate of _corrLen*_baud
+    _mu = 0.0; _muIncr = _sampleRate/(_corrLen*_baud);
+    // Delayline for interpolating sub-sampler
+    _dl = Buffer<float>(2*8);
+    for (size_t i=0; i<2*8; i++) { _dl[i] = 0; }
+    _dl_idx = 0;
+
+    // Assemble phase LUT:
+    double phiMark=0, phiSpace=0;
+    _markLUT  = Buffer< std::complex<float> >(_corrLen);
+    _spaceLUT = Buffer< std::complex<float> >(_corrLen);
+    // Allocate ring-buffers for mark and space symbols
+    _markHist = Buffer< std::complex<float> >(_corrLen);
+    _spaceHist = Buffer< std::complex<float> >(_corrLen);
+
+    // Initialize LUTs and ring-buffers
+    for (size_t i=0; i<_corrLen; i++) {
+      _markLUT[i] = std::exp(std::complex<float>(0.0, phiMark));
+      _spaceLUT[i] = std::exp(std::complex<float>(0.0, phiSpace));
+      phiMark  += (2.*M_PI*_Fmark)/(_baud*_corrLen);
+      phiSpace += (2.*M_PI*_Fspace)/(_baud*_corrLen);
+      _markHist[i] = 0; _spaceHist[i] = 0;
+    }
+    _lutIdx = 0;
+
+    // Get phase increment per symbol
+    _phase = 0; _phaseInc = _phasePeriod/_corrLen;
+
+    // Allocate output buffer:
+    _buffer = Buffer<uint8_t>(src_cfg.bufferSize()/_corrLen + 1);
+
+    LogMessage msg(LOG_DEBUG);
+    msg << "Config AFSK1200 node: " << std::endl
+        << " input sample rate: " << _sampleRate << "Hz" << std::endl
+        << " samples per symbol: " << _muIncr << std::endl
+        << " symbols per bit: " << _corrLen << std::endl
+        << " symbol rate: " << (_corrLen*_baud) << "Hz" << std::endl
+        << " Phase incr/symbol: " << float(_phaseInc)/_phasePeriod;
+
+    Logger::get().log(msg);
+
+    this->setConfig(Config(Traits<uint8_t>::scalarId, _baud, _buffer.size(), 1));
+  }
+
+
+  virtual void process(const Buffer<int16_t> &buffer, bool allow_overwrite) {
+    size_t i=0, o=0;
+    while (i<buffer.size()) {
+      // Update sub-sampler
+      while ((_mu>1) && (i<buffer.size())) {
+        // Put sample into delay line
+        _dl[_dl_idx] = buffer[i]; _dl[_dl_idx+8] = buffer[i];
+        _dl_idx++; if (_dl_idx == 8) { _dl_idx = 0; }
+        _mu-=1; i++;
+      }
+
+      if (i<buffer.size()) {
+        // Get sample
+        float sample = interpolate(_dl.sub(_dl_idx, 8), _mu); _mu += _muIncr;
+        _markHist[_lutIdx] = sample*_markLUT[_lutIdx];
+        _spaceHist[_lutIdx] = sample*_spaceLUT[_lutIdx];
+        // Modulo LUT length
+        _lutIdx++;  if (_lutIdx == _corrLen) { _lutIdx=0; }
+        float f = _getSymbol();
+        // Get symbol
+        _symbols <<= 1; _symbols |= ((f>0)&0x1u);
+
+        // If transition
+        if ((_symbols ^ (_symbols >> 1)) & 0x1u) {
+          // Phase correction
+          if (_phase < (_phasePeriod/2 + _phaseInc/2)) {
+            _phase += _phaseInc/8;
+          } else {
+            _phase -= _phaseInc/8;
+          }
+        }
+
+        // Advance phase
+        _phase += _phaseInc;
+
+        if (_phase >= _phasePeriod) {
+          // Modulo 2 pi
+          _phase &= _phaseMask;
+          // Store bit
+          _lastBits <<= 1; _lastBits |= (_symbols & 1);
+          // Put decoded bit in output buffer
+          _buffer[o++] = ((_lastBits ^ (_lastBits >> 1) ^ 1) & 1);
+        }
+      }
+    }
+    this->send(_buffer.head(o));
+  }
+
+
+protected:
+  inline float _getSymbol() {
+    std::complex<float> markSum(0), spaceSum(0);
+    for (size_t i=0; i<_corrLen; i++) {
+      markSum += _markHist[i]/float(1<<16);
+      spaceSum += _spaceHist[i]/float(1<<16);
+    }
+    markSum /= float(_corrLen); spaceSum /= float(_corrLen);
+    float f = markSum.real()*markSum.real() +
+        markSum.imag()*markSum.imag()
+        - spaceSum.real()*spaceSum.real() -
+        spaceSum.imag()*spaceSum.imag();
+    return f;
+  }
+
+
+protected:
+  float _sampleRate;
+  float _baud;
+  float _Fmark, _Fspace;
+
+  uint32_t _corrLen;
+  uint32_t _lutIdx;
+  Buffer< std::complex<float> > _markLUT;
+  Buffer< std::complex<float> > _spaceLUT;
+
+  float _mu, _muIncr;
+  Buffer< float > _dl;
+  size_t _dl_idx;
+
+  Buffer< std::complex<float> > _markHist;
+  Buffer< std::complex<float> > _spaceHist;
+
+  uint32_t _symbols;
+  uint32_t _lastBits;
+  uint32_t _phase;
+  uint32_t _phaseInc;
+
+  static const uint32_t _phasePeriod = 0x10000u;
+  static const uint32_t _phaseMask   = 0x0ffffu;
+
+  /** Output buffer. */
+  Buffer<uint8_t> _buffer;
+};
+
+
+class AX25: public Sink<uint8_t>, public Source
+{
+public:
+  AX25()
+    : Sink<uint8_t>(), Source()
+  {
+    // pass...
+  }
+
+  virtual ~AX25() {
+    // pass...
+  }
+
+  virtual void config(const Config &src_cfg) {
+    if (! src_cfg.hasType()) { return; }
+    // Check if buffer type matches
+    if (Config::typeId<uint8_t>() != src_cfg.type()) {
+      ConfigError err;
+      err << "Can not configure AX25: Invalid type " << src_cfg.type()
+          << ", expected " << Config::typeId<uint8_t>();
+      throw err;
+    }
+
+    _bitstream = 0;
+    _bitbuffer = 0x00;
+    _state     = 0;
+    _ptr       = _rxbuffer;
+  }
+
+  virtual void process(const Buffer<uint8_t> &buffer, bool allow_overwrite) {
+    for (size_t i=0; i<buffer.size(); i++) {
+      _bitstream <<= 1; _bitstream |= !!(buffer[i]&0x1u);
+
+      if ((_bitstream & 0xffu) == 0x7eu) {
+        if (_state && ((_ptr - _rxbuffer) > 2)) {
+          *_ptr = 0;
+          if (! check_crc_ccitt(_rxbuffer, _ptr-_rxbuffer)) {
+            std::cerr << "Got invalid buffer : " << _rxbuffer << std::endl;
+          } else {
+            std::cerr << "GOT: " << _rxbuffer << std::endl;
+          }
+        }
+
+        _state = 1;
+        _ptr = _rxbuffer;
+        _bitbuffer = 0x80u;
+        continue;
+      }
+
+      if ((_bitstream & 0x7f) == 0x7f) { _state = 0; continue; }
+
+      if (!_state) { continue; }
+
+      if ((_bitstream & 0x3f) == 0x3e) { /* stuffed bit */ continue; }
+
+      if (_bitstream & 1) { _bitbuffer |= 0x100u; }
+
+      if (_bitbuffer & 1) {
+        if ((_ptr-_rxbuffer) > 512) {
+          Logger::get().log(LogMessage(LOG_ERROR, "AX.25 packet too long."));
+          _state = 0; continue;
+        }
+        std::cerr << "Got byte: " << std::hex << int( (_bitbuffer>>1) & 0xff )
+                  << ": " << char(_bitbuffer>>1) << std::endl;
+        *_ptr++ = (_bitbuffer >> 1); _bitbuffer = 0x80u; continue;
+      }
+      _bitbuffer >>= 1;
+    }
+  }
+
+protected:
+  uint32_t _bitstream;
+  uint32_t _bitbuffer;
+  uint32_t _state;
+
+  uint8_t _rxbuffer[512];
+  uint8_t *_ptr;
+};
+
+
+int main(int argc, char *argv[]) {
+  if (2 > argc) { std::cout << "USAGE: sdr_afsk1200 FILENAME" << std::endl; return -1; }
+
+  sdr::Logger::get().addHandler(
+        new sdr::StreamLogHandler(std::cerr, sdr::LOG_DEBUG));
+
+  WavSource src(argv[1], 1024);
+  if (! src.isOpen()) { std::cout << "Can not open file " << argv[1] << std::endl; return -1; }
+
+  AutoCast< int16_t > cast;
+  AFSK demod;
+  AX25     decode;
+
+  src.connect(&cast);
+  cast.connect(&demod);
+  demod.connect(&decode);
+
+  Queue::get().addIdle(&src, &WavSource::next);
+
+  Queue::get().start();
+  Queue::get().wait();
+
+  return 0;
+}
diff --git a/src/wavfile.cc b/src/wavfile.cc
index 257a100..c8fd260 100644
--- a/src/wavfile.cc
+++ b/src/wavfile.cc
@@ -198,6 +198,8 @@ WavSource::isReal() const {
 void
 WavSource::next()
 {
+  //Logger::get().log(LogMessage(LOG_DEBUG, "WavSource: Read next buffer"));
+
   if ((0 == _frames_left)) {
     // Close file
     _file.close();