Fix error bell goes off ref: #18
Merge branch 'fix-error-bell' into dev