Merge remote-tracking branch 'origin/Thomas'

merge NF fixes from Thomas
Merge branch 'master' of https://github.com/NT7S/RadioMeasurements