Reverted changes in xml.hpp for issue #109.
Another attempt to fix issue #109 now for any type that can contain whitespaces