some little local chnges
Merge branch 'master' of git@github.com:FlorianTopf/pixie.git