added Philipp Hancke per pull request #5