Unprivated
Merge branch 'master' of github.com:adueppen/sampler-scaffold-mod

Changed stuff