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