Refactoring stuff
Merge branch 'master' of https://github.com/bobbarebygg/DiaBeatIt