Integrated latest changes from ursenzler #15

Closed danielmarbach closed 12 years ago