adopted the code provided by Simon to have proper name space handling. Largely untested, might break some of the existing applications. That's why it is turned off by default.