Issue #9 (Eier Bug) fixed
Merge branch 'master' into sound