fixed https://github.com/swp2014/berlin2024/issues/2
Merge branch 'master' of github.com:swp2014/berlin2024