merged commit [ b6b168c ] from Imskull/wav2json