Merge for Ralf issue #100