More fixes...
Merge branch 'master' of https://github.com/conradhappeliv/musicHackathon