partially applied pull request #182 from Frank Morgner -- updated the common frameworks source files