#11 corrections after real test drive of multiple recording
Merge remote-tracking branch 'origin/master'