Merge branch 'recording-mode' - closes #15