Changes submitted by Christoph Schwick