merge NF fixes from Thomas
fixing merge issue
Merge branch 'master' into jason

fix merge issue
Merge branch 'jason'
Merge branch 'master' of https://github.com/NT7S/RadioMeasurements