style updates
merge
merge
Merge branch 'develop' of https://github.com/mtdbass5/audio-testing into develop
style updates