modify by cb
Merge branch 'master' of ssh://git@github.com/Berken/Spiegel.git