Now wont crash with sounds. Fixes #4.
Fixed merge conflict.