Merge branch 'audiomap'

Closes #60
Closes #68