Merge branch 'master' of github.com:nocarryr/nomadic_recording_lib

Conflicts:
	nomadic-recording-lib.eric5.e4p