Merge branch 'master' of github.com:ingmarschuster/distributions
slight fixes
fixed merge issues